Squashed 'app/templates/' changes from f5cabf1..b35166a

b35166a update

git-subtree-dir: app/templates
git-subtree-split: b35166ab46f1427827bfbade217991433ea3ddca
Merge commit 'd8f1651f0081efae48e3727276d5997e65100cae'