Squashed 'app/templates/' changes from 4066d11..a211cba

a211cba update

git-subtree-dir: app/templates
git-subtree-split: a211cbab3fb0dfcbacc7458487be985aea214140
Merge commit 'e1797b31bd856757bba2102f9ad0097fc333d3f3'
0.0.13