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
Avoid LESS nesting if isn't needed
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
Merge pull request #10695 from FredericoC/fix-nav-active-caret

Fixed issue where caret wouldn't inherit "active" li style on nav-pills
Merge branch '3.0.0'

Conflicts:
	dist/css/bootstrap.min.css
	scss/_navs.scss
	scss/_tables.scss