Squashed 'app/templates/' changes from b4982c6..4299d73

4299d73 update

git-subtree-dir: app/templates
git-subtree-split: 4299d73dd980660d2765e23a2f6f047159760768
Merge commit '0dfa9eaa528a3298a93f88b2365c14c8d028928c'