user edit NOT an admin page
Merge branch 'dev' into feature/map