remember me cookie
Merge branch 'develop' into paduc