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

Conflicts:
	CONTRIBUTORS.md

CONTRIBUTORS.md

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