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

Conflicts:
	CONTRIBUTORS.md

CONTRIBUTORS.md

@@ -43,4 +43,5 @@
  - [0sm0] (https://github.com/0sm0)
  - [swhitmore](https://github.com/swhitmore)
  - [DigiTM](https://github.com/DigiTM)
- - [crisliv / xliv](https://github.com/crisliv)
+ - [crisliv / xliv](https://github.com/crisliv)
+ - [Yogi](https://github.com/yogi12)