fixes for timestamps
small fixes
Merge branch 'gh-pages' of github.com:FMRobot/template into gh-pages