Added ability to change password
Merge branch 'editUserProfile'