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

Conflicts:
	CONTRIBUTORS.md

CONTRIBUTORS.md

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