added merge in edit user
come back username to admin panel
Merge branch 'develop' into merge-in-edit-user
Merge pull request #124 from geekhub-php/merge-in-edit-user

merge in edit user