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

Conflicts:
	CONTRIBUTORS.md

CONTRIBUTORS.md

@@ -45,4 +45,5 @@
  - [DigiTM](https://github.com/DigiTM)
  - [crisliv / xliv](https://github.com/crisliv)
  - [Yogi](https://github.com/yogi12)
- - [madFloyd] (https://github.com/madFloyd)
+ - [madFloyd] (https://github.com/madFloyd)
+ - [yardameus] (https://github.com/yardameus)