Squashed 'app/templates/' changes from a91a60b..e468b67

e468b67 update

git-subtree-dir: app/templates
git-subtree-split: e468b67f12884aa861b2c37c6b6cbf1dca7e77fc
Merge commit 'cf7327eb29b807350e32411189dce1da471a4a47'