Add first and last name to user edit. Remove first and last name from student form.
Merge changes