Fix a bug in the date
Update the tooltip
Merge branch 'develop'
Merge branch 'master' into gh-pages