#500 Media Manager: added filtering by tags
#500 Merge branch 'dev' of github.com:devbridge/BetterCMS into dev

Conflicts:
	Modules/BetterCms.Module.MediaManager/Content/Resources/MediaGlobalization.resx
	Modules/BetterCms.Module.MediaManager/Models/Maps/MediaMap.cs
	Modules/BetterCms.Module.MediaManager/Models/Media.cs