refs 8552 User can edit/update own profile
Merge branch 'master' of github.com:MiraitSystems/enju_trunk