fixing cookie's expire time
Merge branch 'refs/heads/timepicker'
Merge branch 'refs/heads/master' into unicorn