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

Conflicts:
	CONTRIBUTORS.md

CONTRIBUTORS.md

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