Squashed 'app/templates/' changes from 8bfd8b1..af21310

af21310 update

git-subtree-dir: app/templates
git-subtree-split: af21310316291b17ab2fd79054bbdb30b2953447
Merge commit '53f16b56f4edcd082083c34dc529ef5b111f260f'
0.0.26