Squashed 'app/templates/' changes from 4e802df..ff96800

ff96800 update

git-subtree-dir: app/templates
git-subtree-split: ff9680025cb5f9398f2793476224508c5e93b411
Merge commit 'e966b0742d2f173dcbeeba7025f0bf356ded7138'