diff --git a/server/package-lock.json b/server/package-lock.json
index b6e4cf6..183b3ed 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -269,15 +269,20 @@
       "dev": true
     },
     "bson": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/bson/-/bson-1.0.6.tgz",
-      "integrity": "sha512-D8zmlb46xfuK2gGvKmUjIklQEouN2nQ0LEHHeZ/NoHM2LDiMk2EYzZ5Ntw/Urk+bgMDosOZxaRzXxvhI5TcAVQ=="
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-1.0.9.tgz",
+      "integrity": "sha512-IQX9/h7WdMBIW/q/++tGd+emQr0XMdeZ6icnT/74Xk9fnabWn+gZgpE+9V+gujL3hhJOoNrnDVY7tWdzc7NUTg=="
     },
     "buffer-equal": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz",
       "integrity": "sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs="
     },
+    "buffer-shims": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
+      "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E="
+    },
     "busboy": {
       "version": "0.2.14",
       "resolved": "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz",
@@ -1157,6 +1162,11 @@
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
       "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ=="
     },
+    "hooks-fixed": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hooks-fixed/-/hooks-fixed-2.0.2.tgz",
+      "integrity": "sha512-YurCM4gQSetcrhwEtpQHhQ4M7Zo7poNGqY4kQGeBS6eZtOcT3tnNs01ThFa0jYBByAiYt1MjMjP/YApG0EnAvQ=="
+    },
     "http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -1284,9 +1294,9 @@
       }
     },
     "kareem": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.0.7.tgz",
-      "integrity": "sha512-p8+lEpsNs4N0fvNOC1/zzDO0wDrD3Pb1G+OwfIG+gKVK3MyY5jeaGYh+9Qx6jb4fEG2b3E6U98vaE9MH7Gilsw=="
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/kareem/-/kareem-1.5.0.tgz",
+      "integrity": "sha1-4+QQHZ3P3imXadr0tNtk2JXRdEg="
     },
     "load-bmfont": {
       "version": "1.3.0",
@@ -1413,64 +1423,102 @@
       }
     },
     "mongodb": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.0.7.tgz",
-      "integrity": "sha512-n/14kMJEoARXz1qhpNPhUocqy+z5130jhqgEIX1Tsl8UVpHrndQ8et+VmgC4yPK/I8Tcgc93JEMQCHTekBUnNA==",
+      "version": "2.2.34",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.34.tgz",
+      "integrity": "sha1-o09Zu+thdUrsQy3nLD/iFSakTBo=",
       "requires": {
-        "mongodb-core": "3.0.7"
+        "es6-promise": "3.2.1",
+        "mongodb-core": "2.1.18",
+        "readable-stream": "2.2.7"
+      },
+      "dependencies": {
+        "es6-promise": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz",
+          "integrity": "sha1-7FYjOGgDKQkgcXDDlEjiREndH8Q="
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+        },
+        "readable-stream": {
+          "version": "2.2.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.7.tgz",
+          "integrity": "sha1-BwV6y+JGeyIELTb5jFrVBwVOlbE=",
+          "requires": {
+            "buffer-shims": "~1.0.0",
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~1.0.6",
+            "string_decoder": "~1.0.0",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
       }
     },
     "mongodb-core": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.0.7.tgz",
-      "integrity": "sha512-z6YufO7s40wLiv2ssFshqoLS4+Kf+huhHq6KZ7gDArsKNzXYjAwTMnhEIJ9GQ8fIfBGs5tBLNPfbIDoCKGPmOw==",
+      "version": "2.1.18",
+      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.18.tgz",
+      "integrity": "sha1-TEYTm986HwMt7ZHbSfOO7AFlkFA=",
       "requires": {
-        "bson": "1.0.6",
-        "require_optional": "1.0.1"
+        "bson": "~1.0.4",
+        "require_optional": "~1.0.0"
       }
     },
     "mongoose": {
-      "version": "5.0.17",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.0.17.tgz",
-      "integrity": "sha512-RV1WBQhzW7oOhStR+s7LQYfgQWTJm4hgmU3TqtgTiBCfnj5/sNliX2/SY+ef7tpIZRUqEBV5xITZdAlwQ6Ymdg==",
+      "version": "4.13.19",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.13.19.tgz",
+      "integrity": "sha512-O41XmkbAZtLK6Uw4cqjI30s0sP8oZeG+aWweOIyE2VYHMQiYDWhVkBMtsv+Kv8chDizaBhO5oErTHexLQKzU+w==",
       "requires": {
-        "async": "2.1.4",
-        "bson": "1.0.6",
-        "kareem": "2.0.7",
+        "async": "2.6.0",
+        "bson": "~1.0.4",
+        "hooks-fixed": "2.0.2",
+        "kareem": "1.5.0",
         "lodash.get": "4.4.2",
-        "mongodb": "3.0.7",
-        "mongoose-legacy-pluralize": "1.0.2",
-        "mpath": "0.4.1",
-        "mquery": "3.0.0",
+        "mongodb": "2.2.34",
+        "mpath": "0.5.1",
+        "mpromise": "0.5.5",
+        "mquery": "2.3.3",
         "ms": "2.0.0",
+        "muri": "1.3.0",
         "regexp-clone": "0.0.1",
         "sliced": "1.0.1"
       },
       "dependencies": {
         "async": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.1.4.tgz",
-          "integrity": "sha1-LSFgx3iAMuTdbL4lAvH5osj2zeQ=",
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
+          "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
           "requires": {
-            "lodash": "4.17.4"
+            "lodash": "^4.14.0"
           }
         }
       }
     },
-    "mongoose-legacy-pluralize": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz",
-      "integrity": "sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ=="
-    },
     "mpath": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.4.1.tgz",
-      "integrity": "sha512-NNY/MpBkALb9jJmjpBlIi6GRoLveLUM0pJzgbp9vY9F7IQEb/HREC/nxrixechcQwd1NevOhJnWWV8QQQRE+OA=="
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.5.1.tgz",
+      "integrity": "sha512-H8OVQ+QEz82sch4wbODFOz+3YQ61FYz/z3eJ5pIdbMEaUzDqA268Wd+Vt4Paw9TJfvDgVKaayC0gBzMIw2jhsg=="
+    },
+    "mpromise": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mpromise/-/mpromise-0.5.5.tgz",
+      "integrity": "sha1-9bJCWddjrMIlewoMjG2Gb9UXMuY="
     },
     "mquery": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mquery/-/mquery-3.0.0.tgz",
-      "integrity": "sha512-WL1Lk8v4l8VFSSwN3yCzY9TXw+fKVYKn6f+w86TRzOLSE8k1yTgGaLBPUByJQi8VcLbOdnUneFV/y3Kv874pnQ==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/mquery/-/mquery-2.3.3.tgz",
+      "integrity": "sha512-NC8L14kn+qxJbbJ1gbcEMDxF0sC3sv+1cbRReXXwVvowcwY1y9KoVZFq0ebwARibsadu8lx8nWGvm3V0Pf0ZWQ==",
       "requires": {
         "bluebird": "3.5.0",
         "debug": "2.6.9",
@@ -1510,6 +1558,11 @@
         "xtend": "4.0.1"
       }
     },
+    "muri": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/muri/-/muri-1.3.0.tgz",
+      "integrity": "sha512-FiaFwKl864onHFFUV/a2szAl7X0fxVlSKNdhTf+BM8i8goEgYut8u5P9MqQqIYwvaMxjzVESsoEm/2kfkFH1rg=="
+    },
     "nodemon": {
       "version": "1.12.1",
       "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.12.1.tgz",
@@ -1947,7 +2000,8 @@
                   "version": "2.1.1",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
                   "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "aproba": {
                   "version": "1.1.1",
@@ -2006,7 +2060,8 @@
                   "version": "0.4.2",
                   "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
                   "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "bcrypt-pbkdf": {
                   "version": "1.0.1",
@@ -2023,6 +2078,7 @@
                   "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
                   "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "inherits": "2.0.3"
                   }
@@ -2032,6 +2088,7 @@
                   "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
                   "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "hoek": "2.16.3"
                   }
@@ -2041,6 +2098,7 @@
                   "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz",
                   "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "balanced-match": "0.4.2",
                     "concat-map": "0.0.1"
@@ -2050,7 +2108,8 @@
                   "version": "1.0.0",
                   "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
                   "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "caseless": {
                   "version": "0.12.0",
@@ -2070,13 +2129,15 @@
                   "version": "1.1.0",
                   "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
                   "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "combined-stream": {
                   "version": "1.0.5",
                   "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
                   "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "delayed-stream": "1.0.0"
                   }
@@ -2085,19 +2146,22 @@
                   "version": "0.0.1",
                   "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
                   "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "console-control-strings": {
                   "version": "1.1.0",
                   "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
                   "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "core-util-is": {
                   "version": "1.0.2",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
                   "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "cryptiles": {
                   "version": "2.0.5",
@@ -2149,7 +2213,8 @@
                   "version": "1.0.0",
                   "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
                   "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "delegates": {
                   "version": "1.0.0",
@@ -2179,7 +2244,8 @@
                   "version": "1.0.2",
                   "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
                   "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "forever-agent": {
                   "version": "0.6.1",
@@ -2204,13 +2270,15 @@
                   "version": "1.0.0",
                   "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
                   "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "fstream": {
                   "version": "1.0.11",
                   "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
                   "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "graceful-fs": "4.1.11",
                     "inherits": "2.0.3",
@@ -2271,6 +2339,7 @@
                   "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
                   "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "fs.realpath": "1.0.0",
                     "inflight": "1.0.6",
@@ -2284,7 +2353,8 @@
                   "version": "4.1.11",
                   "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
                   "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "har-schema": {
                   "version": "1.0.5",
@@ -2328,7 +2398,8 @@
                   "version": "2.16.3",
                   "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
                   "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "http-signature": {
                   "version": "1.1.1",
@@ -2347,6 +2418,7 @@
                   "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
                   "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "once": "1.4.0",
                     "wrappy": "1.0.2"
@@ -2356,7 +2428,8 @@
                   "version": "2.0.3",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
                   "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "ini": {
                   "version": "1.3.4",
@@ -2370,6 +2443,7 @@
                   "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
                   "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "number-is-nan": "1.0.1"
                   }
@@ -2385,7 +2459,8 @@
                   "version": "1.0.0",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
                   "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "isstream": {
                   "version": "0.1.2",
@@ -2468,13 +2543,15 @@
                   "version": "1.27.0",
                   "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
                   "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "mime-types": {
                   "version": "2.1.15",
                   "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
                   "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "mime-db": "1.27.0"
                   }
@@ -2484,6 +2561,7 @@
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
                   "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "brace-expansion": "1.1.7"
                   }
@@ -2492,13 +2570,15 @@
                   "version": "0.0.8",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
                   "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "mkdirp": {
                   "version": "0.5.1",
                   "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
                   "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "minimist": "0.0.8"
                   }
@@ -2563,7 +2643,8 @@
                   "version": "1.0.1",
                   "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
                   "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "oauth-sign": {
                   "version": "0.8.2",
@@ -2584,6 +2665,7 @@
                   "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
                   "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "wrappy": "1.0.2"
                   }
@@ -2617,7 +2699,8 @@
                   "version": "1.0.1",
                   "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
                   "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "performance-now": {
                   "version": "0.2.0",
@@ -2630,7 +2713,8 @@
                   "version": "1.0.7",
                   "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
                   "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "punycode": {
                   "version": "1.4.1",
@@ -2673,6 +2757,7 @@
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
                   "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "buffer-shims": "1.0.0",
                     "core-util-is": "1.0.2",
@@ -2719,6 +2804,7 @@
                   "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
                   "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "glob": "7.1.2"
                   }
@@ -2727,7 +2813,8 @@
                   "version": "5.0.1",
                   "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
                   "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "semver": {
                   "version": "5.3.0",
@@ -2792,6 +2879,7 @@
                   "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
                   "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "code-point-at": "1.1.0",
                     "is-fullwidth-code-point": "1.0.0",
@@ -2803,6 +2891,7 @@
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
                   "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "safe-buffer": "5.0.1"
                   }
@@ -2819,6 +2908,7 @@
                   "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
                   "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "ansi-regex": "2.1.1"
                   }
@@ -2835,6 +2925,7 @@
                   "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
                   "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "block-stream": "0.0.9",
                     "fstream": "1.0.11",
@@ -2896,7 +2987,8 @@
                   "version": "1.0.2",
                   "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
                   "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "uuid": {
                   "version": "3.0.1",
@@ -2929,7 +3021,8 @@
                   "version": "1.0.2",
                   "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
                   "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 }
               }
             },
@@ -4340,8 +4433,8 @@
       "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz",
       "integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==",
       "requires": {
-        "resolve-from": "2.0.0",
-        "semver": "5.5.0"
+        "resolve-from": "^2.0.0",
+        "semver": "^5.1.0"
       }
     },
     "resolve-from": {
@@ -4360,9 +4453,9 @@
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
     "semver": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
     },
     "shebang-command": {
       "version": "1.2.0",
@@ -5349,7 +5442,8 @@
                 "ansi-regex": {
                   "version": "2.1.1",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                  "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+                  "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+                  "optional": true
                 },
                 "aproba": {
                   "version": "1.1.1",
@@ -5400,7 +5494,8 @@
                 "balanced-match": {
                   "version": "0.4.2",
                   "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-                  "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
+                  "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+                  "optional": true
                 },
                 "bcrypt-pbkdf": {
                   "version": "1.0.1",
@@ -5415,6 +5510,7 @@
                   "version": "0.0.9",
                   "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
                   "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+                  "optional": true,
                   "requires": {
                     "inherits": "2.0.3"
                   }
@@ -5423,6 +5519,7 @@
                   "version": "2.10.1",
                   "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
                   "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+                  "optional": true,
                   "requires": {
                     "hoek": "2.16.3"
                   }
@@ -5431,6 +5528,7 @@
                   "version": "1.1.7",
                   "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz",
                   "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=",
+                  "optional": true,
                   "requires": {
                     "balanced-match": "0.4.2",
                     "concat-map": "0.0.1"
@@ -5439,7 +5537,8 @@
                 "buffer-shims": {
                   "version": "1.0.0",
                   "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-                  "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E="
+                  "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=",
+                  "optional": true
                 },
                 "caseless": {
                   "version": "0.12.0",
@@ -5456,12 +5555,14 @@
                 "code-point-at": {
                   "version": "1.1.0",
                   "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-                  "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+                  "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+                  "optional": true
                 },
                 "combined-stream": {
                   "version": "1.0.5",
                   "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
                   "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+                  "optional": true,
                   "requires": {
                     "delayed-stream": "1.0.0"
                   }
@@ -5469,17 +5570,20 @@
                 "concat-map": {
                   "version": "0.0.1",
                   "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-                  "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+                  "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+                  "optional": true
                 },
                 "console-control-strings": {
                   "version": "1.1.0",
                   "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-                  "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+                  "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+                  "optional": true
                 },
                 "core-util-is": {
                   "version": "1.0.2",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-                  "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+                  "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+                  "optional": true
                 },
                 "cryptiles": {
                   "version": "2.0.5",
@@ -5525,7 +5629,8 @@
                 "delayed-stream": {
                   "version": "1.0.0",
                   "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-                  "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+                  "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+                  "optional": true
                 },
                 "delegates": {
                   "version": "1.0.0",
@@ -5551,7 +5656,8 @@
                 "extsprintf": {
                   "version": "1.0.2",
                   "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
-                  "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA="
+                  "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
+                  "optional": true
                 },
                 "forever-agent": {
                   "version": "0.6.1",
@@ -5573,12 +5679,14 @@
                 "fs.realpath": {
                   "version": "1.0.0",
                   "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-                  "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+                  "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+                  "optional": true
                 },
                 "fstream": {
                   "version": "1.0.11",
                   "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
                   "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+                  "optional": true,
                   "requires": {
                     "graceful-fs": "4.1.11",
                     "inherits": "2.0.3",
@@ -5634,6 +5742,7 @@
                   "version": "7.1.2",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
                   "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+                  "optional": true,
                   "requires": {
                     "fs.realpath": "1.0.0",
                     "inflight": "1.0.6",
@@ -5646,7 +5755,8 @@
                 "graceful-fs": {
                   "version": "4.1.11",
                   "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-                  "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+                  "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+                  "optional": true
                 },
                 "har-schema": {
                   "version": "1.0.5",
@@ -5685,7 +5795,8 @@
                 "hoek": {
                   "version": "2.16.3",
                   "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-                  "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
+                  "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+                  "optional": true
                 },
                 "http-signature": {
                   "version": "1.1.1",
@@ -5702,6 +5813,7 @@
                   "version": "1.0.6",
                   "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
                   "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+                  "optional": true,
                   "requires": {
                     "once": "1.4.0",
                     "wrappy": "1.0.2"
@@ -5710,7 +5822,8 @@
                 "inherits": {
                   "version": "2.0.3",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                  "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+                  "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+                  "optional": true
                 },
                 "ini": {
                   "version": "1.3.4",
@@ -5722,6 +5835,7 @@
                   "version": "1.0.0",
                   "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
                   "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+                  "optional": true,
                   "requires": {
                     "number-is-nan": "1.0.1"
                   }
@@ -5735,7 +5849,8 @@
                 "isarray": {
                   "version": "1.0.0",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-                  "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+                  "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+                  "optional": true
                 },
                 "isstream": {
                   "version": "0.1.2",
@@ -5808,12 +5923,14 @@
                 "mime-db": {
                   "version": "1.27.0",
                   "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
-                  "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE="
+                  "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
+                  "optional": true
                 },
                 "mime-types": {
                   "version": "2.1.15",
                   "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
                   "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
+                  "optional": true,
                   "requires": {
                     "mime-db": "1.27.0"
                   }
@@ -5822,6 +5939,7 @@
                   "version": "3.0.4",
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
                   "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+                  "optional": true,
                   "requires": {
                     "brace-expansion": "1.1.7"
                   }
@@ -5829,12 +5947,14 @@
                 "minimist": {
                   "version": "0.0.8",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-                  "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+                  "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+                  "optional": true
                 },
                 "mkdirp": {
                   "version": "0.5.1",
                   "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
                   "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+                  "optional": true,
                   "requires": {
                     "minimist": "0.0.8"
                   }
@@ -5893,7 +6013,8 @@
                 "number-is-nan": {
                   "version": "1.0.1",
                   "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-                  "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+                  "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+                  "optional": true
                 },
                 "oauth-sign": {
                   "version": "0.8.2",
@@ -5911,6 +6032,7 @@
                   "version": "1.4.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
                   "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+                  "optional": true,
                   "requires": {
                     "wrappy": "1.0.2"
                   }
@@ -5940,7 +6062,8 @@
                 "path-is-absolute": {
                   "version": "1.0.1",
                   "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-                  "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+                  "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+                  "optional": true
                 },
                 "performance-now": {
                   "version": "0.2.0",
@@ -5951,7 +6074,8 @@
                 "process-nextick-args": {
                   "version": "1.0.7",
                   "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-                  "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+                  "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+                  "optional": true
                 },
                 "punycode": {
                   "version": "1.4.1",
@@ -5989,6 +6113,7 @@
                   "version": "2.2.9",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
                   "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=",
+                  "optional": true,
                   "requires": {
                     "buffer-shims": "1.0.0",
                     "core-util-is": "1.0.2",
@@ -6033,6 +6158,7 @@
                   "version": "2.6.1",
                   "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
                   "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
+                  "optional": true,
                   "requires": {
                     "glob": "7.1.2"
                   }
@@ -6040,7 +6166,8 @@
                 "safe-buffer": {
                   "version": "5.0.1",
                   "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
-                  "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c="
+                  "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
+                  "optional": true
                 },
                 "semver": {
                   "version": "5.3.0",
@@ -6098,6 +6225,7 @@
                   "version": "1.0.2",
                   "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
                   "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+                  "optional": true,
                   "requires": {
                     "code-point-at": "1.1.0",
                     "is-fullwidth-code-point": "1.0.0",
@@ -6108,6 +6236,7 @@
                   "version": "1.0.1",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
                   "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
+                  "optional": true,
                   "requires": {
                     "safe-buffer": "5.0.1"
                   }
@@ -6122,6 +6251,7 @@
                   "version": "3.0.1",
                   "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
                   "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+                  "optional": true,
                   "requires": {
                     "ansi-regex": "2.1.1"
                   }
@@ -6136,6 +6266,7 @@
                   "version": "2.2.1",
                   "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
                   "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+                  "optional": true,
                   "requires": {
                     "block-stream": "0.0.9",
                     "fstream": "1.0.11",
@@ -6191,7 +6322,8 @@
                 "util-deprecate": {
                   "version": "1.0.2",
                   "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-                  "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+                  "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+                  "optional": true
                 },
                 "uuid": {
                   "version": "3.0.1",
@@ -6220,7 +6352,8 @@
                 "wrappy": {
                   "version": "1.0.2",
                   "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-                  "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+                  "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+                  "optional": true
                 }
               }
             },