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

Conflicts:
	CONTRIBUTORS.md

CONTRIBUTORS.md

@@ -34,4 +34,5 @@
  - [pjrollo2000](https://github.com/pjrollo2000)
  - [abobader](https://github.com/abobader)
  - [milli260876](https://github.com/milli260876)
- - [vileboy] (https://github.com/vileboy)
+ - [vileboy] (https://github.com/vileboy)
+ - [starkadius] (https://github.com/starkadius)