Squashed 'app/templates/' changes from 6748577..8587271

8587271 update

git-subtree-dir: app/templates
git-subtree-split: 8587271e2fa9428fddd300a2d14a30211ca5a210
Merge commit '72144a0ef970f53e81ff83b41828721267d08542'
0.0.23