Update CONTRIBUTORS.md
Update CONTRIBUTORS.md
Merge branch 'master' of https://github.com/brocass/MediaBrowser

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

Conflicts:
	CONTRIBUTORS.md