fixed typo in 1 annotation timestamp
Merge branch 'develop' into gh-pages