Squashed 'app/templates/' changes from 9fdcbb3..0dba706

0dba706 update

git-subtree-dir: app/templates
git-subtree-split: 0dba706340cda6be250a3be3e218fbe89d080957
Merge commit 'f2acb43cb990cbf9ea183b2064ceecddddfa8403'