added change password gui

still need to add serverAdapter method to do an UPDATE user to change
the passwords
Removed merge conflicts