update session timeout handling
update database
Merge branch 'bowen' into rtong