changed changeEmail to use single error field and to do some clientside checking and also allow for server to respond that email was already in use or other errors
corrcted merge issues in apptemplates