Squashed 'app/templates/' changes from 98310c7..4e802df

4e802df update

git-subtree-dir: app/templates
git-subtree-split: 4e802dfd4335e69926ffd67b83bea6e6cd00390d
Merge commit '5545bce5ca76261db49484777f706c855f452454'