Squashed 'app/templates/' changes from cc66e04..e0ef79d

e0ef79d update

git-subtree-dir: app/templates
git-subtree-split: e0ef79d411fd45d55a01738c0b6524e860dd49c5
Merge commit 'd74f09ab6a7e51fcb830a08d1b5a8736e76aab61'
0.0.20