Squashed 'app/templates/' changes from b44817a..9c32f9b

9c32f9b update
11ba56a update

git-subtree-dir: app/templates
git-subtree-split: 9c32f9b490ef4387f52684640d4ba16b295a533f
Merge commit 'db8617352294a79ed2a41c574a7c14190b87f6c2'