add fields to edit user and allow params in app controller
move password to bottom of edit page
merge