fixed jackson error, fixed password match reset field, updated imports in models