Merge branch '3.0.0-wip-badges-to-counters' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip-badges-to-counters
Tighten up badges docs; less bottom margin on h3
Update less/carousel.less

lessified .carousel-caption
Merge pull request #6750 from nextgenthemes/3.0.0-wip

Update less/carousel.less
Update line-height and padding for input sizes
Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	docs/assets/js/application.js
	docs/components.html
	docs/templates/pages/components.mustache
	less/sprites.less
Remove gallery link from navbar; add to homepage examples section instead
Update starter template to include left/right padding on inner container; also include body padding
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Button up navbar form which was adding 2px padding to .navbar
only round jumbotron corners at 768px+
Refactor jumbotron example:

* Add hella CSS comments
* Reduce padding on body to height of navbar, then set top margin on jumbotron at +768px
* Wrap marketing copy and footer in an extra div so we can set some padding for ideal responsive views
Rename marketing-narrow to jumbotron-narrow for mo betta naming schemes
Refactor jumbotron-narrow.html example

* Make it mobile-first
* Add a handful of comments to explain CSS
* Instead of an <hr> between custom header and jumbotron, use border for a tighter mobile layout
Update input-group-addon for input sizes
button element instead of href-less a tag for navbar button
start to refactor justified nav example
Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
	docs/examples/hero.html
	docs/examples/sticky-footer-navbar.html
Refactor colors and progress bars

* Buttons and progress bars now make use of more semantic global @brand- colors
* Progress bars have been rewritten to reduce the number of possible selectors
* Instead of .progress .bar, it's .progress-bar for individual bars of color, ultimately making for less CSS
Fixes #6657: Upgrade Normalize to 2.1.0