Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
fixes #8957
fix typo in comment
Merge pull request #36 from ggam/patch-1

Included required JavaScript in navbar-static-top
Remove requirement of `.list-group-flush` when list groups are in panels

Fixes #8900
move form layouts from input groups back to forms (messed this up in b281ad64096d919145159ffbc4e1a5b284708d9b)
Merge pull request #8934 from twbs/generalize-horiz-form-example

use separate `form-group`s in horiz form example for greater generality
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext

Conflicts:
	dist/css/bootstrap.min.css
Merge pull request #8939 from frabrunelle/3.0.0-wip

add nav to media object and thumbnails
Merge branch 'btngroup' of https://github.com/liuyl/bootstrap into liuyl-btngroup

Conflicts:
	dist/css/bootstrap.min.css
Change line-height value with variable for btn-large and btn-small
Change value for padding on pagination to variables
fix Horizontal form docs
Merge pull request #9037 from ChrisRiddell/horizontal-form-fix

Fix Horizontal form docs
Merge remote-tracking branch 'upstream/3.0.0-wip' into 3.0.0-wip
JS docs: fix caps of "CSS" acronym
JavaScript docs: fix caps of "JS"
JS docs: put `transitionEnd` within <code>
Update .navbar-toggle to match other navbar el

In place of commit #9040, fix #8844
And sizing .navbar-toggle more like .btn elem
+ change `position:absolute` to `position:relative`
+ remove `right: 10px` in favor of `float:right`
+ change to `height: 34px`
+ remove `top:` in favor of `.navbar-vertical-align` basis new height
+ change `padding:` to match `.btn` el