Merge branch 'master' into docs_derp

Conflicts:
	_config.yml
the final frontier
more nav changes
Small fix: I noticed the use of a deprecated variable. This seems to be the only occurrence.
Merge pull request #12028 from moshevds/deprecated-screen-md

Small fix: I noticed the use of a deprecated variable.
big brand update
grunt on last merge
Merge branch 'master' into docs_derp
spacing
fixed .clearfix example, + doc link
Merge two fs variable declarations into one

One is enough.
Merge pull request #12035 from tomByrer/master

fixed .clearfix example, + doc link
drop the title
fixes #10658 jQuery Popover content loses bound events on second setContent call.
Merge pull request #11203 from jasny/patch-1

Scrollspy acting up when targets are hidden
Rearrange repository contents because muahahahahahaha
Streamline copy process by not bringing over full files into docs/dist/, only take minified ones
no more page.base_url
fixes #11288 - Vertical scroll position of modal saves between openings
Merge branch 'master' of github.com:twbs/bootstrap