Merge branch 'fixtimestampdisplay' into gh-pages
Merge branch 'bindonce' into gh-pages

Conflicts:
	index.html