Squashed 'app/templates/' changes from e468b67..4d757f5

4d757f5 update

git-subtree-dir: app/templates
git-subtree-split: 4d757f50525f54882deec5eab5e8e6943fb0c2ae
Merge commit 'cee253294b542b46b2f4344f2b6e75739113de23'
0.0.18