Remove commented out code and properly nest CSS again for .collapse
rearrange customizer content
Merge branch '3.0.0-wip' into 3.0.0-sass-wip

Conflicts:
	docs/assets/css/bootstrap.css
	scss/_component-animations.scss