fixed some merge deletions that disabled password hashing and the improved UserManager.update(). Tests run successfully.