Squashed 'app/templates/' changes from b0452cf..88ee3bd

88ee3bd update

git-subtree-dir: app/templates
git-subtree-split: 88ee3bd0e99c4570a4947d830517e0bcfbfeb4d3
Merge commit 'aa5d7e3b23db1d2c7569c9e3274c8c3d1fb39b71'