keep me logged in
keep me logged in bug
Merge branch 'dev'