Update data in diagrams.
Merge remote-tracking branch 'colin/gh-pages' into gh-pages
More changes and template drafts