* master:
Fix bad grunt merge and then G R U N T
Reorder the Gruntfile a bit
Fixes#12892: Link to one of the SO articles on Bootstrap modals and YouTube
Remove unneeded quotes.
Rename generateRawFilesJs to generateRawFiles
Remove redundant parens
Conflicts:
docs/assets/js/raw-files.min.js
test-infra/npm-shrinkwrap.canonical.json