Squashed 'app/assets/' changes from b50a75c..b604173

b604173 Fixup commit: changes from dev-angular

git-subtree-dir: app/assets
git-subtree-split: b604173bb4523f7a6c28f34279052971470083ad
Merge commit 'bc35d1938efd034b1774ca849d80d4286d2b47d9' into feature/style-guide-subtree