Squashed 'app/templates/' changes from 9c32f9b..a91a60b

a91a60b update
6f9e9fd update

git-subtree-dir: app/templates
git-subtree-split: a91a60bcdc54e579e88328a7986dcd3c9c2b7b6a
Merge commit '53b60a142a0796a0c1effaa98df587e4aef4a090'
0.0.17