Resolved conflicts with user controller

Should be able to edit and save users on both the admin page and the user-profile-edit page!