user change password implemented
fixed merge
fixed another merge