Conflicts:
	js/carousel.js

Revert UMD for now, due to #13812.

https://github.com/twbs/bootstrap/commit/32bde78e1996a92e6b801e1f4a475d5ab48685f8

Use @font-size-small variable to calculate <small> font-size

Will hopefully revert this reversion and land a fully-working version of UMD in v3.3.0.

Revert "some changes from #13801 - add strict mode back and =="
This reverts commit 2b302f69.

Revert "Fix regression of #10038 introduced by #13772"
This reverts commit e9d6756a.

Revert "MD/CommonJS/Globals #12909"
This reverts commit 1c6fa901.

Revert "address #13811"
This reverts commit f347d7d9.

Conflicts:
    js/carousel.js
    js/collapse.js
    js/dropdown.js
    js/modal.js
    js/tab.js
    js/tooltip.js

Remove broken link

Fix typo in css - buttons docs

Remove deprecated JSCS rules

Document #13863

Switch to uber/npm-shrinkwrap for npm-shrinkwrap.json generation

Instead of our homegrown grunt/shrinkwrap.js
Fixes #13483.
New npm-shrinkwrap.json is human-readable but still in a consistent/stable format.
Should aid debugging, produce better diffs, and be less prone to merge conflicts

Fix @gray-light in docs

Always use preserveComment: 'some'

Use full deprecation version