Merge remote-tracking branch 'origin/master'

client/package-lock.json

@@ -7231,9 +7231,9 @@
       }
     },
     "moment": {
-      "version": "2.18.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
-      "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=",
+      "version": "2.21.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.21.0.tgz",
+      "integrity": "sha512-TCZ36BjURTeFTM/CwRcViQlfkMvL1/vFISuNLO5GkcVm1+QHfbSiNqZuWeMFjj1/3+uAjXswgRk30j1kkLYJBQ==",
       "dev": true
     },
     "move-concurrently": {
@@ -13415,7 +13415,7 @@
         "filesize": "3.5.10",
         "lodash": "4.17.4",
         "mkdirp": "0.5.1",
-        "moment": "2.18.1"
+        "moment": "2.21.0"
       },
       "dependencies": {
         "debug": {

client/package.json

@@ -53,6 +53,7 @@
         "karma-sourcemap-loader": "0.3.7",
         "karma-spec-reporter": "0.0.32",
         "karma-webpack": "2.0.9",
+        "moment": "2.21.0",
         "ngtemplate-loader": "2.0.1",
         "node-sass": "4.7.2",
         "phantomjs": "2.1.7",