run grunt
Merge branch 'master' of github.com:twbs/bootstrap
include a copy of the CC-BY 3.0 License that the docs are under

downloaded from http://creativecommons.org/licenses/by/3.0/legalcode.txt
fixed issue where caret wouldn't inherit "active" li style on nav-pills, which caused the caret to stay blue
corrected caret colour when a nav dropdown is open
white → #fff
fix #10732
Merge pull request #10724 from ZDroid/patch-1

white → #fff
Fixes #10694: Remove unnecessary `content` property from `.caret`
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
	dist/css/bootstrap.min.css
Avoid LESS nesting if isn't needed
Fix a silly typo
Merge pull request #10743 from hnrch02/patch-1

Fix a silly typo
fix #10737
Merge pull request #10693 from twbs/include-docs-license

include a copy of the CC-BY 3.0 License that the docs are under
@headingsColor → @headings-color
Merge pull request #10749 from ZDroid/patch-2

@headingsColor → @headings-color
Fixes #10755: Don't remove quotes around q element by default
Merge branch 'master' of github.com:twbs/bootstrap
Merge pull request #10741 from ZDroid/patch-1

Avoid LESS nesting if isn't needed