Squashed 'app/templates/' changes from 88ee3bd..1dec7fe

1dec7fe update

git-subtree-dir: app/templates
git-subtree-split: 1dec7fe7a7fa47f4a0e81ac891695cee9c7173a0
Merge commit '2a687fe72e5aa8bf401d1fbf915b4528a8bc91e5'
0.0.6