combined edit password and user profile page
have single page to edit password and user profile
Merge branch 'edit_password_and_profile' into development