Squashed 'app/templates/' changes from ff96800..b0452cf

b0452cf update

git-subtree-dir: app/templates
git-subtree-split: b0452cfcbe6a30d47602c292775cb96c81ac0dca
Merge commit 'e76ec36796bb66874fe893afe861c9b82640dcc2'