Merge branch 'master' into greenkeeper-grunt-contrib-uglify-2.3.0

Author: swilliamset

package.json

@@ -32,8 +32,8 @@
     "grunt-contrib-copy": "1.0.0",
     "grunt-contrib-jshint": "1.1.0",
     "grunt-contrib-less": "1.4.1",
-    "grunt-contrib-qunit": "1.3.0",
-    "grunt-contrib-uglify": "2.3.0",
+    "grunt-contrib-qunit": "2.0.0",
+    "grunt-contrib-uglify": "2.2.0",
     "grunt-contrib-watch": "1.0.0",
     "grunt-htmllint": "^0.2.7",
     "grunt-jsbeautifier": "0.2.13",
@@ -46,7 +46,7 @@
     "load-grunt-config": "0.19.2",
     "load-grunt-tasks": "3.5.2",
     "semver": "5.3.0",
-    "serve-static": "1.12.0"
+    "serve-static": "1.12.2"
   },
   "engines": {
     "node": ">=5.8.x"