Add users/edit form
Merge branch 'user-edit'