set cookie time
Merge branch 'dev'