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

Conflicts:
	CONTRIBUTORS.md

CONTRIBUTORS.md

@@ -31,3 +31,4 @@
  - [RedshirtMB](https://github.com/RedshirtMB)
  - [thealienamongus](https://github.com/thealienamongus)
  - [brocass](https://github.com/brocass)
+ - [pjrollo2000](https://github.com/pjrollo2000)