set session cookies to expire in 2 hours.
Merge branch 'develop'