Squashed 'app/templates/' changes from 90a7bcb..4066d11

4066d11 update

git-subtree-dir: app/templates
git-subtree-split: 4066d118249822210f8ca1ee1f3b48dee4d4f907
Merge commit 'fe677db1351be4707749ee433804d88b2004cc77'
0.0.12