Admin can create and edit users
Merge branch 'admin-update-users'