add change password
Merge branch 'master' into edit_password

making sure edit passwords feature plays well with updates to master.