Squashed 'app/templates/' changes from 66de883..01b8b69

01b8b69 update

git-subtree-dir: app/templates
git-subtree-split: 01b8b694edd901144b2956c9b0af998cd57da195
Merge commit '4dd2c35264b5621df2d60ace92a4e85c0e3c93c9'
0.0.15