fix up code snippet
fix up code snippet
Undo important on hide/show utilties; punt to 3.0
Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
	docs/assets/css/bootstrap.css
	docs/templates/pages/base-css.mustache
	less/dropdowns.less
	less/forms.less
Add important flag to .show/.hide utility classes; remove .hide requirement from modals
remove .hide specificity override from grid classes
Merge branch '3.0.0-wip' into bs3-normalize

Conflicts:
	less/bootstrap.less
Convert normalize comments to // style
Normalize indentation from 4 to 2 spaces
Fixes #6352: marketing-alternate broken nav in FF17
Update the examples index:

* Retina ready screenshots
* Added screenshot and link to justified nav example (previously unlinked marketing-alternate.html)
Merge pull request #6354 from cvrebert/3.0.0-wip

add comment regarding caveat of #6199 impl per discussion in/of 14844db862
Update new example name and links
Finish migrating to Normalize 2:

* Port print styles from reset.less to scaffolding.less
* Port responsive image styles from reset.less to scaffolding.less
Remove reset.less now that Normalize 2 is fully integrated
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Miscellaneous changes to docs
update docs regarding normalize and clearfix
Merge pull request #6360 from Quy/2.3.0-wip

Miscellaneous changes to docs
flatten buttons and forms