Squashed 'app/templates/' changes from 01b8b69..b44817a

b44817a update

git-subtree-dir: app/templates
git-subtree-split: b44817a11498ca9c6a511f60013a67446efa967e
Merge commit '22e867783b4dfcb1142e19420388296b9a2d0b4a'
0.0.16