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

834af6c update

git-subtree-dir: app/templates
git-subtree-split: 834af6c3905ad9316d7606a9f2b6e90a61420c07
Merge commit '23d0d681389e37aea7e909211a4d257b88a0a209'