resolve 3d & mbc issues
3.0.5445.6
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Conflicts:
	SharedVersion.cs
updated nuget
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

Conflicts:
	MediaBrowser.Providers/Movies/TrailerMetadataService.cs
	MediaBrowser.Server.Implementations/Library/Resolvers/LocalTrailerResolver.cs