Squashed 'app/templates/' changes from f5c2e8e..49f1b4c

49f1b4c update

git-subtree-dir: app/templates
git-subtree-split: 49f1b4ca012a0d327c57cab6a3925083eaf94fae
Merge commit 'ca5e22e22c5b8c67ea501f7f9c93d8624b9775bc'
0.0.11