updated
updated session to database
updated
update config
Merge branch 'master' into master18