sessiom timeout set to 12h
Merge branch 'dev'