password change aded to edit page
merged master