Allow robots meta-tag to be overridden by page settings (PageHeadText)
Refactored and fixed AdvancedFriendlyUrlProvider.RemoveExcludedPartsOfPath(...) to not replace /ctl/Category/mid/416 by /ctl/416?Category=mid
Added test case for controlKey "Category"
Check to see if viewMobileCookie is null before trying a Set.
When detecting a deleted file in the folder provider it should delete the file data in DNN directly and not attempt to delete the source which is already deleted.
DNN-6179 Update DAM Upload Dialog Styling, added icons
Merge pull request #165 from janjonas/DNN-5953

Fix DNN-5953: Refactored and fixed AdvancedFriendlyUrlProvider.RemoveExcludedPartsOfPath(...) to not replace /ctl/Category/mid/416 by /ctl/416?Category=mid
DNN-6193: replace control key with ignore case.
DNN-6194 add ordering to SearchDeletedItems_Select
Merge pull request #163 from raphael-m/feature/DNN-5946

DNN-5946 Allow robots meta-tag to be overridden by page settings
Merge branch 'DNN-6070' of https://github.com/donker/Dnn.Platform into donker-DNN-6070

Conflicts:
	DNN Platform/Library/Entities/Urls/FriendlyUrlController.cs
Merge branch 'donker-DNN-6070' into development
Merge pull request #210 from donker/DNN-6139

DNN-6139 Folder Provider deletion fix
fix broken build caused by invalid merge of dnn-6070
DNN-6159 EVOQCONTENT: Installation fails when using the database.mdf file that comes with the product - Upgrade Database.mdf to SQL 2008 compat
update codemirror to 4.7 release
DNN-4451 Update to Code Mirror 4.8