Done add user and edit user
Merge origin/master