Squashed 'app/templates/' changes from 49f1b4c..ac002a3

ac002a3 update

git-subtree-dir: app/templates
git-subtree-split: ac002a3dd84a996c1e500ec57327f8eeb647e4a3
Merge commit 'f35b8ddf928d834f06cfc363dabbeab2c3290fa6'