Squashed 'app/templates/' changes from f8b77d8..8bfd8b1

8bfd8b1 update

git-subtree-dir: app/templates
git-subtree-split: 8bfd8b15f916ef2d3e04977a84b9580818368319
Merge commit '55e8f63384567c9f351fa34853436ca67c9371a2'
0.0.25