Merge branch 'develop' into develop

Gruntfile.js

@@ -339,7 +339,6 @@ module.exports = function(grunt) {
         'copy:coverage',
         'express:test',
         'mochaTest:test',
-        'mochaTest:coverage',
         'clean:tmp'
     ]);
 

package.json

@@ -30,44 +30,44 @@
     "async": "1.5.2",
     "body-parser": "1.15.2",
     "chart.js": "1.1.1",
-    "clean-css": "3.4.18",
+    "clean-css": "3.4.23",
     "color-diff": "1.0.0",
     "compression": "1.6.2",
-    "cors": "2.7.1",
+    "cors": "2.8.1",
     "css-mq-parser": "0.0.3",
-    "debug": "2.2.0",
+    "debug": "2.4.5",
     "easyxml": "2.0.1",
-    "ejs": "^2.5.1",
+    "ejs": "2.5.5",
     "express": "4.14.0",
     "fontkit": "1.4.2",
     "imagemin": "5.2.2",
     "imagemin-jpegoptim": "5.0.0",
     "imagemin-jpegtran": "5.0.2",
-    "imagemin-optipng": "5.1.0",
-    "imagemin-svgo": "5.1.0",
+    "imagemin-optipng": "5.2.1",
+    "imagemin-svgo": "5.2.0",
     "is-eot": "1.0.0",
     "is-gif": "1.0.0",
-    "is-http2": "1.0.4",
+    "is-http2": "1.1.0",
     "is-jpg": "1.0.0",
     "is-otf": "0.1.2",
     "is-png": "1.0.0",
-    "is-svg": "2.0.1",
+    "is-svg": "2.1.0",
     "is-ttf": "0.2.2",
     "is-woff": "1.0.3",
     "is-woff2": "1.0.0",
     "lwip": "0.0.9",
-    "md5": "2.1.0",
+    "md5": "2.2.1",
     "meow": "3.7.0",
     "minimize": "2.0.0",
     "parse-color": "1.0.0",
-    "phantomas": "1.16.0",
-    "ps-node": "0.1.2",
+    "phantomas": "1.17.0",
+    "ps-node": "0.1.4",
     "q": "1.4.1",
-    "request": "2.72.0",
-    "rimraf": "2.5.3",
+    "request": "2.79.0",
+    "rimraf": "2.5.4",
     "temporary": "0.0.8",
     "try-thread-sleep": "1.0.0",
-    "uglify-js": "2.7.0"
+    "uglify-js": "2.7.5"
   },
   "devDependencies": {
     "chai": "~3.5.0",
@@ -91,7 +91,7 @@
     "grunt-usemin": "~3.1.1",
     "grunt-webfont": "~1.4.0",
     "matchdep": "~1.0.1",
-    "mocha": "~2.5.3",
+    "mocha": "~3.2.0",
     "sinon": "~1.17.4",
     "sinon-chai": "~2.8.0"
   },