added edit page
Merge branch 'master' into users
added new user fields