add change password in Admin page
merge and deal with conflicts
Fix merge conflicts