DNN-5852 Catch exception when uploaded image dimensions can't be determined
DNN-5852 Ensure Orientation gets set even if exception is caught
DNN-5874 Check if unique display name is required in user editor
Merge pull request #1 from dnnsoftware/development

test
Committed Changes for DNN-5909
DNN-4167 - Update the Editor sprites and CSS to fix the toolbar Print button
DNN-5744: Fixed module installer to display URL from module manifest
Fixed DNN-5955: AUM 301 redirects should be done with HttpRequest.RedirectPermanent
Update User.ascx.cs

changed the localization key to DisplayNameNotUnique
Update EditUser.ascx.resx

Changed User Name for Display Name
Update User.ascx.resx

Changed UserNameNotUnique to DisplayNameNotUnique
Update EditUser.ascx.cs

Changed UserName to DisplayName
Merge pull request #2 from dnnsoftware/development

update
g
Merge branch 'development' of https://github.com/valadas/Dnn.Platform
Merge pull request #166 from janjonas/DNN-5744

DNN-5744: Fixed module installer to display URL from module manifest
Merge pull request #160 from valadas/development

DNN-5874 Check if unique display name is required in user editor
Merge branch 'development' into DNN-5852

Conflicts:
	DNN Platform/DotNetNuke.Web/InternalServices/FileUploadController.cs
Merge pull request #164 from jbrinkman/DNN-4167

DNN-4167 - Update the sprites and CSS to fix the RadEditor toolbar
Merge branch 'DNN-5909' of github.com:mitchelsellers/Dnn.Platform into pr/162

Conflicts:
	Website/Providers/DataProviders/SqlDataProvider/07.03.04.SqlDataProvider