Squashed 'app/templates/' changes from b35166a..98310c7

98310c7 update

git-subtree-dir: app/templates
git-subtree-split: 98310c74a1004101005da69bfbdbac3379af9528
Merge commit '5024732fa198daba3d2c2bb4f63fcb4de5221820'