Merge branch 'v4-dev' into v4-docs-streamlined

diff --cc docs/4.0/components/popovers.md
Simple merge

diff --cc docs/4.0/components/tooltips.md
Simple merge

diff --cc package.json
index e44d3018658f17c65a74bd69a9475f81ee8161c8,dffc58f8369115b16cf896e730ee3ff293a653b2..08fe1b40c62890a3a8b5e53f2534b13b36491b0a
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -77,9 -78,10 +77,9 @@@
      "babel-cli": "^6.24.1",
      "babel-eslint": "^7.2.3",
      "babel-plugin-transform-es2015-modules-strip": "^0.1.1",
-     "babel-preset-es2015": "^7.0.0-alpha.7",
+     "babel-preset-es2015": "^6.24.1",
      "clean-css-cli": "^4.1.3",
      "eslint": "^3.19.0",
 -    "htmlhint": "^0.9.13",
      "htmllint-cli": "^0.0.6",
      "node-sass": "^4.5.3",
      "nodemon": "^1.11.0",