Squashed 'app/templates/' changes from d9caa62..9fdcbb3

9fdcbb3 update

git-subtree-dir: app/templates
git-subtree-split: 9fdcbb3362c9737413d782653cc67d579f7fad77
Merge commit 'fb7cfe26c5dfbd2a2b85759c01a673a753abd945'
0.0.28