update to latest server
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser.Theater

Conflicts:
	MediaBrowser.UI/CorePlugins/MediaBrowser.Plugins.DefaultTheme.dll