Squashed 'app/templates/' changes from ac002a3..90a7bcb

90a7bcb style:

git-subtree-dir: app/templates
git-subtree-split: 90a7bcb7bc24388a75529a360f50a2b73e2afd3b
Merge commit '37acf4036f1c360f88d3f4e460d05d5bce8fea25'