Squashed 'app/templates/' changes from ed24246..b4982c6

b4982c6 update

git-subtree-dir: app/templates
git-subtree-split: b4982c6644c8aa31bf5c89ecd34cfa14a77d85dc
Merge commit 'a1a0937d276efc98618103a484cf1d57e58c88e4'