- Back button added on edit server and add user screen
Merge origin/master