Templating
Merge branch 'master' of https://github.com/schaman/icoach-templating