Merge branch 'release/0.6.0' into development
concat js
brings child theme css back, reverts 94375c6-ish
fix up top bar colors
bump version to 0.6.1
Merge branch 'release/0.6.1'