Add change password and profile functions
Merge origin/master