Merge pull request #1 from osvik/gh-pages

Update templates
Merge pull request #1 from greenpeace/gh-pages

Merge pull request #1 from osvik/gh-pages