Admin: users
Merge branch 'master' into users_admin
User Admin: update user fixed
User Admin: reset password
Merge branch 'users_admin'
User Admin: error on reset password