renaming cookie (date => interval)
Merge branch 'refs/heads/timepicker'
Merge branch 'refs/heads/master' into unicorn