Squashed 'app/templates/' changes from 1dec7fe..2f71cc8

2f71cc8 update

git-subtree-dir: app/templates
git-subtree-split: 2f71cc877bfd640e107a737a2e561a69814f25a3
Merge commit 'bc3c83fe824dfe32beee43aea5322000ebfbb125'
0.0.7