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

Conflicts:
	CONTRIBUTORS.md

CONTRIBUTORS.md

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