DNN-5852 Catch exception when uploaded image dimensions can't be determined
DNN-5852 Ensure Orientation gets set even if exception is caught
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
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
Merge branch 'pr/162' into development
Merge remote-tracking branch 'dnnsoftware/development' into development
Merge pull request #170 from raphael-m/DNN-5955

Fixed DNN-5955: AUM 301 redirects should be done with HttpRequest.RedirectPermanent
Merge pull request #158 from dnnsoftware/DNN-5852

DNN-5852 Catch exception when uploaded image dimensions can't be determined
DNN-5937 SI: Windows Live - Change done to Log In URL can no longer use Windows Live authentication
dnn-6000 Installation/Upgrade - Fails @ 18% - ERROR occurred - There is already an object named 'GetFoldersByPermissions' in the Database
Revert "DNN-5874 Check if unique display name is required in user editor"
Merge pull request #175 from dnnsoftware/revert-160-development

Revert "DNN-5874 Check if unique display name is required in user editor...
Merge pull request #3 from dnnsoftware/development

update to current