Move 'remember-me' checkbox to admin page'
Merge branch 'master' into development