old password input added to change password form
Merge remote-tracking branch 'origin/master'