changed manage users
Merge origin/master