Squashed 'app/templates/' changes from 834af6c..f774bff

f774bff update

git-subtree-dir: app/templates
git-subtree-split: f774bfffb04f8cdb0bf88228df5992ef7bd68fb2
Merge commit 'd46c59f42dd2c18fabb8c43b70976ebe778a8e85'