Squashed 'app/templates/' changes from 4d757f5..cc66e04

cc66e04 update

git-subtree-dir: app/templates
git-subtree-split: cc66e046c3164a0ea59eebc8cfb5b9167e4c1b68
Merge commit '03f6edb1a03dcbd16fb446fb02c1837b1d138682'
0.0.19