remove time offsets
fix timelines
Merge branch 'develop' into gh-pages