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

Conflicts:
	CONTRIBUTORS.md

CONTRIBUTORS.md

@@ -26,3 +26,4 @@
  - [doron1] (https://github.com/doron1)
  - [brainfryd] (https://github.com/brainfryd)
  - [DGMayor] (http://github.com/DGMayor)
+ - [Jon-theHTPC] (https://github.com/Jon-theHTPC)