Extend session timeout.
Merge branch 'master' into mobme_production