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
Merge remote-tracking branch 'refs/remotes/origin/gh-pages' into gh-pages
List of templates and use git
Better default link tags