resolve mixed folder detection
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

Conflicts:
	MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs