fixing broken templates.
Merge pull request #421 from continuuity/feature/fix-templates

fixing broken templates.