add user profile edit controller.
Merge remote-tracking branch 'origin/master'