links in templates
Merge branch 'master' of github.com:danieleguido/walt
pre popcorn release