Squashed 'app/templates/' changes from 2f71cc8..ed24246

ed24246 update

git-subtree-dir: app/templates
git-subtree-split: ed242462483810ee5ded6839eae867be2970baaa
Merge commit 'd54adea02d8b320e885f6c138b5bdafaf116b252'