change password, add id to URL
Merge remote-tracking branch 'origin/master'