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

Conflicts:
	CONTRIBUTORS.md

CONTRIBUTORS.md

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