Change rememberMe to remember_me
Merge remote-tracking branch 'origin/development' into development