Fix asset tests for latest sprockets (sigh)
Fix layout of box tabs
Merge branch 'master' of github.com:SpontaneousCMS/spontaneous
Move copying of assets into separate publish step
Merge remote-tracking branch 'upstream/master'

Conflicts:
	CHANGELOG.md