Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

CONTRIBUTORS.md

@@ -28,4 +28,5 @@
  - [DGMayor] (http://github.com/DGMayor)
  - [Jon-theHTPC] (https://github.com/Jon-theHTPC)
  - [aspdend] (https://github.com/aspdend)
- - [RedshirtMB](https://github.com/RedshirtMB)
+ - [RedshirtMB](https://github.com/RedshirtMB)
+ - [thealienamongus](https://github.com/thealienamongus)