Squashed 'app/templates/' changes from f774bff..f8b77d8

f8b77d8 update

git-subtree-dir: app/templates
git-subtree-split: f8b77d8dbdb92f918d572b0079d30b719dddfbd5
Merge commit 'eff4ef5f4f206287cde113558bd2e9b4dd99240e'
0.0.24