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

Conflicts:
	CONTRIBUTORS.md

CONTRIBUTORS.md

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