Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev

Conflicts:
	MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs