let session cookie expire in 12 hours instead of 2.
Merge branch 'develop'