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

test
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 #160 from valadas/development

DNN-5874 Check if unique display name is required in user editor