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

Conflicts:
	CONTRIBUTORS.md

CONTRIBUTORS.md

@@ -35,4 +35,5 @@
  - [abobader](https://github.com/abobader)
  - [milli260876](https://github.com/milli260876)
  - [vileboy] (https://github.com/vileboy)
- - [starkadius] (https://github.com/starkadius)
+ - [starkadius] (https://github.com/starkadius)
+ - [wraslor](https://github.com/wraslor)