Remove commented out code and properly nest CSS again for .collapse
rearrange customizer content
Use base padding for input-group-addon class
Merge pull request #7980 from burnsra/3.0.0-wip

Use base padding for input-group-addon class
add show/shown hide/hidden events to dropdown + update dropdown links for testing + catch a few missed namespace things
fixes #4781
add data-ride=carousel support for starting carousel on load
Merge remote-tracking branch 'upstream/3.0.0-wip' into base-url-docs

Conflicts:
	docs/customize.html