From bca52cb6fa18a76cf66bf4c80550f35fadb7dfdc Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Tue, 1 Aug 2017 14:30:17 +0200
Subject: [PATCH] Client Tasks (#8894)

* fix filter button style

* display completed todos

* fix reward control position

* begin to add edit modal

* start adding settings to edit modal

* add task saving, creating and deleting

* fixes

* add tags and repeat frequency for habits

* clicking on links should not open the edit modal

* checklist editing

* repeatables and checklists

* delete checklist items

* add rewards price

* update shrinkwrap

* pin cwait
---
 npm-shrinkwrap.json                           | 2609 +++++++++++------
 package.json                                  |    5 +-
 website/client/assets/scss/task.scss          |   59 +
 website/client/assets/svg/difficulty-hard.svg |    5 +
 .../client/assets/svg/difficulty-medium.svg   |    5 +
 .../client/assets/svg/difficulty-normal.svg   |    5 +
 .../client/assets/svg/difficulty-trivial.svg  |    3 +
 website/client/assets/svg/filter.svg          |    2 +-
 .../client/assets/svg/for-css/positive.svg    |    3 +
 .../components/groups/groupFormModal.vue      |    2 +-
 website/client/components/tasks/column.vue    |   20 +-
 website/client/components/tasks/task.vue      |   65 +-
 website/client/components/tasks/taskModal.vue |  457 +++
 website/client/components/tasks/user.vue      |   63 +-
 website/client/store/actions/tasks.js         |   79 +-
 website/client/store/getters/tasks.js         |    5 +
 website/client/store/index.js                 |    6 +-
 website/common/locales/en/newClient.json      |    9 +
 18 files changed, 2495 insertions(+), 907 deletions(-)
 create mode 100644 website/client/assets/svg/difficulty-hard.svg
 create mode 100644 website/client/assets/svg/difficulty-medium.svg
 create mode 100644 website/client/assets/svg/difficulty-normal.svg
 create mode 100644 website/client/assets/svg/difficulty-trivial.svg
 create mode 100644 website/client/assets/svg/for-css/positive.svg
 create mode 100644 website/client/components/tasks/taskModal.vue

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 7e97fadfe1..76d192b156 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "3.106.1",
+  "version": "3.107.0",
   "dependencies": {
     "@gulp-sourcemaps/map-sources": {
       "version": "1.0.0",
@@ -8,9 +8,34 @@
       "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz"
     },
     "@slack/client": {
-      "version": "3.9.0",
+      "version": "3.10.0",
       "from": "@slack/client@>=3.8.1 <4.0.0",
-      "resolved": "https://registry.npmjs.org/@slack/client/-/client-3.9.0.tgz"
+      "resolved": "https://registry.npmjs.org/@slack/client/-/client-3.10.0.tgz"
+    },
+    "@types/express": {
+      "version": "4.0.36",
+      "from": "@types/express@>=4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.0.36.tgz"
+    },
+    "@types/express-serve-static-core": {
+      "version": "4.0.49",
+      "from": "@types/express-serve-static-core@*",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.0.49.tgz"
+    },
+    "@types/mime": {
+      "version": "1.3.1",
+      "from": "@types/mime@*",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.1.tgz"
+    },
+    "@types/node": {
+      "version": "8.0.17",
+      "from": "@types/node@*",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.17.tgz"
+    },
+    "@types/serve-static": {
+      "version": "1.7.31",
+      "from": "@types/serve-static@*",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.7.31.tgz"
     },
     "abbrev": {
       "version": "1.1.0",
@@ -23,9 +48,9 @@
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz"
     },
     "acorn": {
-      "version": "4.0.11",
+      "version": "4.0.13",
       "from": "acorn@>=4.0.3 <5.0.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz"
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz"
     },
     "acorn-dynamic-import": {
       "version": "2.0.2",
@@ -65,7 +90,7 @@
     },
     "adm-zip": {
       "version": "0.4.7",
-      "from": "adm-zip@>=0.4.7 <0.5.0",
+      "from": "adm-zip@0.4.7",
       "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz",
       "dev": true
     },
@@ -76,9 +101,9 @@
       "dev": true
     },
     "agent-base": {
-      "version": "2.0.1",
+      "version": "2.1.1",
       "from": "agent-base@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.0.1.tgz"
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz"
     },
     "ajv": {
       "version": "4.11.8",
@@ -100,12 +125,6 @@
       "from": "alphanum-sort@>=1.0.1 <2.0.0",
       "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz"
     },
-    "alter": {
-      "version": "0.2.0",
-      "from": "alter@>=0.2.0 <0.3.0",
-      "resolved": "https://registry.npmjs.org/alter/-/alter-0.2.0.tgz",
-      "dev": true
-    },
     "amazon-payments": {
       "version": "0.0.4",
       "from": "amazon-payments@0.0.4",
@@ -281,24 +300,24 @@
       "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-0.1.0.tgz"
     },
     "anymatch": {
-      "version": "1.3.0",
+      "version": "1.3.2",
       "from": "anymatch@>=1.3.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz"
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz"
     },
     "apidoc": {
-      "version": "0.17.5",
+      "version": "0.17.6",
       "from": "apidoc@>=0.17.5 <0.18.0",
-      "resolved": "https://registry.npmjs.org/apidoc/-/apidoc-0.17.5.tgz"
+      "resolved": "https://registry.npmjs.org/apidoc/-/apidoc-0.17.6.tgz"
     },
     "apidoc-core": {
-      "version": "0.8.2",
-      "from": "apidoc-core@>=0.8.1 <0.9.0",
-      "resolved": "https://registry.npmjs.org/apidoc-core/-/apidoc-core-0.8.2.tgz",
+      "version": "0.8.3",
+      "from": "apidoc-core@>=0.8.2 <0.9.0",
+      "resolved": "https://registry.npmjs.org/apidoc-core/-/apidoc-core-0.8.3.tgz",
       "dependencies": {
         "glob": {
-          "version": "7.1.1",
+          "version": "7.1.2",
           "from": "glob@>=7.1.1 <8.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"
         },
         "semver": {
           "version": "5.3.0",
@@ -319,9 +338,9 @@
       "dev": true
     },
     "aproba": {
-      "version": "1.1.1",
+      "version": "1.1.2",
       "from": "aproba@>=1.0.3 <2.0.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz"
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz"
     },
     "archive-type": {
       "version": "3.2.0",
@@ -349,15 +368,20 @@
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz"
     },
     "arr-flatten": {
-      "version": "1.0.3",
+      "version": "1.1.0",
       "from": "arr-flatten@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz"
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"
     },
     "array-differ": {
       "version": "1.0.0",
       "from": "array-differ@>=1.0.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
     },
+    "array-each": {
+      "version": "1.0.1",
+      "from": "array-each@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz"
+    },
     "array-filter": {
       "version": "0.0.1",
       "from": "array-filter@>=0.0.0 <0.1.0",
@@ -384,10 +408,9 @@
       "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz"
     },
     "array-slice": {
-      "version": "0.2.3",
-      "from": "array-slice@>=0.2.3 <0.3.0",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-      "dev": true
+      "version": "1.0.0",
+      "from": "array-slice@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz"
     },
     "array-union": {
       "version": "1.0.2",
@@ -412,8 +435,9 @@
     },
     "arrify": {
       "version": "1.0.1",
-      "from": "arrify@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"
+      "from": "arrify@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "dev": true
     },
     "asap": {
       "version": "1.0.0",
@@ -446,16 +470,10 @@
       "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz",
       "dev": true
     },
-    "ast-traverse": {
-      "version": "0.1.1",
-      "from": "ast-traverse@>=0.1.1 <0.2.0",
-      "resolved": "https://registry.npmjs.org/ast-traverse/-/ast-traverse-0.1.1.tgz",
-      "dev": true
-    },
     "ast-types": {
-      "version": "0.9.11",
+      "version": "0.9.12",
       "from": "ast-types@>=0.0.0 <1.0.0",
-      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.11.tgz",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.12.tgz",
       "dev": true
     },
     "astw": {
@@ -500,15 +518,20 @@
       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz"
     },
     "aws-sdk": {
-      "version": "2.52.0",
+      "version": "2.93.0",
       "from": "aws-sdk@>=2.0.25 <3.0.0",
-      "resolved": "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.52.0.tgz",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.93.0.tgz",
       "dependencies": {
         "sax": {
           "version": "1.2.1",
           "from": "sax@1.2.1",
           "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"
         },
+        "uuid": {
+          "version": "3.0.1",
+          "from": "uuid@3.0.1",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"
+        },
         "xmlbuilder": {
           "version": "4.2.1",
           "from": "xmlbuilder@4.2.1",
@@ -527,9 +550,9 @@
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"
     },
     "axios": {
-      "version": "0.16.1",
+      "version": "0.16.2",
       "from": "axios@>=0.16.0 <0.17.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.16.1.tgz"
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.16.2.tgz"
     },
     "babel-code-frame": {
       "version": "6.22.0",
@@ -537,19 +560,19 @@
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz"
     },
     "babel-core": {
-      "version": "6.24.1",
+      "version": "6.25.0",
       "from": "babel-core@>=6.0.0 <7.0.0",
-      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.24.1.tgz"
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.25.0.tgz"
     },
     "babel-eslint": {
       "version": "7.2.3",
-      "from": "babel-eslint@latest",
+      "from": "babel-eslint@>=7.2.3 <8.0.0",
       "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-7.2.3.tgz"
     },
     "babel-generator": {
-      "version": "6.24.1",
-      "from": "babel-generator@>=6.24.1 <7.0.0",
-      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.24.1.tgz"
+      "version": "6.25.0",
+      "from": "babel-generator@>=6.25.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.25.0.tgz"
     },
     "babel-helper-call-delegate": {
       "version": "6.24.1",
@@ -617,9 +640,9 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz"
     },
     "babel-plugin-istanbul": {
-      "version": "4.1.3",
+      "version": "4.1.4",
       "from": "babel-plugin-istanbul@>=4.0.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.4.tgz",
       "dev": true,
       "dependencies": {
         "find-up": {
@@ -637,7 +660,7 @@
     },
     "babel-plugin-syntax-dynamic-import": {
       "version": "6.18.0",
-      "from": "babel-plugin-syntax-dynamic-import@latest",
+      "from": "babel-plugin-syntax-dynamic-import@>=6.18.0 <7.0.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz"
     },
     "babel-plugin-syntax-object-rest-spread": {
@@ -791,24 +814,24 @@
       "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz"
     },
     "babel-runtime": {
-      "version": "6.23.0",
+      "version": "6.25.0",
       "from": "babel-runtime@>=6.11.6 <7.0.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.25.0.tgz"
     },
     "babel-template": {
-      "version": "6.24.1",
-      "from": "babel-template@>=6.24.1 <7.0.0",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz"
+      "version": "6.25.0",
+      "from": "babel-template@>=6.25.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.25.0.tgz"
     },
     "babel-traverse": {
-      "version": "6.24.1",
-      "from": "babel-traverse@>=6.24.1 <7.0.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz"
+      "version": "6.25.0",
+      "from": "babel-traverse@>=6.25.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz"
     },
     "babel-types": {
-      "version": "6.24.1",
-      "from": "babel-types@>=6.24.1 <7.0.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+      "version": "6.25.0",
+      "from": "babel-types@>=6.25.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz"
     },
     "babelify": {
       "version": "7.3.0",
@@ -816,9 +839,9 @@
       "resolved": "https://registry.npmjs.org/babelify/-/babelify-7.3.0.tgz"
     },
     "babylon": {
-      "version": "6.17.1",
-      "from": "babylon@>=6.11.0 <7.0.0",
-      "resolved": "http://registry.npmjs.org/babylon/-/babylon-6.17.1.tgz"
+      "version": "6.17.4",
+      "from": "babylon@>=6.17.2 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.17.4.tgz"
     },
     "backo2": {
       "version": "1.0.2",
@@ -827,9 +850,9 @@
       "dev": true
     },
     "balanced-match": {
-      "version": "0.4.2",
-      "from": "balanced-match@>=0.4.1 <0.5.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
+      "version": "1.0.0",
+      "from": "balanced-match@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"
     },
     "base64-arraybuffer": {
       "version": "0.1.5",
@@ -838,9 +861,9 @@
       "dev": true
     },
     "base64-js": {
-      "version": "1.2.0",
+      "version": "1.2.1",
       "from": "base64-js@>=1.0.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz"
     },
     "base64-stream": {
       "version": "0.1.3",
@@ -940,9 +963,9 @@
       "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz"
     },
     "binary-extensions": {
-      "version": "1.8.0",
+      "version": "1.9.0",
       "from": "binary-extensions@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz"
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.9.0.tgz"
     },
     "bindings": {
       "version": "1.2.1",
@@ -971,30 +994,25 @@
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz"
     },
     "bn.js": {
-      "version": "4.11.6",
+      "version": "4.11.7",
       "from": "bn.js@>=4.1.1 <5.0.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz"
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.7.tgz"
     },
     "body-parser": {
-      "version": "1.17.1",
+      "version": "1.17.2",
       "from": "body-parser@>=1.15.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.17.1.tgz",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz",
       "dependencies": {
         "debug": {
-          "version": "2.6.1",
-          "from": "debug@2.6.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"
+          "version": "2.6.7",
+          "from": "debug@2.6.7",
+          "resolved": "http://registry.npmjs.org/debug/-/debug-2.6.7.tgz"
         },
         "iconv-lite": {
           "version": "0.4.15",
           "from": "iconv-lite@0.4.15",
           "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"
         },
-        "ms": {
-          "version": "0.7.2",
-          "from": "ms@0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"
-        },
         "qs": {
           "version": "6.4.0",
           "from": "qs@6.4.0",
@@ -1018,9 +1036,9 @@
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.0.0-alpha.6.tgz"
     },
     "bootstrap-vue": {
-      "version": "0.15.8",
-      "from": "bootstrap-vue@>=0.15.8 <0.16.0",
-      "resolved": "http://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-0.15.8.tgz",
+      "version": "0.16.1",
+      "from": "bootstrap-vue@>=0.16.1 <0.17.0",
+      "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-0.16.1.tgz",
       "dependencies": {
         "tether": {
           "version": "1.4.0",
@@ -1442,21 +1460,15 @@
       }
     },
     "brace-expansion": {
-      "version": "1.1.7",
+      "version": "1.1.8",
       "from": "brace-expansion@>=1.1.7 <2.0.0",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz"
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"
     },
     "braces": {
       "version": "1.8.5",
       "from": "braces@>=1.8.2 <2.0.0",
       "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz"
     },
-    "breakable": {
-      "version": "1.0.0",
-      "from": "breakable@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/breakable/-/breakable-1.0.0.tgz",
-      "dev": true
-    },
     "brorand": {
       "version": "1.1.0",
       "from": "brorand@>=1.0.1 <2.0.0",
@@ -1507,9 +1519,9 @@
           }
         },
         "crypto-browserify": {
-          "version": "3.11.0",
+          "version": "3.11.1",
           "from": "crypto-browserify@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz"
+          "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz"
         },
         "glob": {
           "version": "5.0.15",
@@ -1576,9 +1588,9 @@
       "resolved": "https://registry.npmjs.org/bson/-/bson-1.0.4.tgz"
     },
     "buffer": {
-      "version": "5.0.6",
-      "from": "buffer@5.0.6",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.0.6.tgz"
+      "version": "4.9.1",
+      "from": "buffer@4.9.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"
     },
     "buffer-crc32": {
       "version": "0.2.13",
@@ -1700,9 +1712,9 @@
       }
     },
     "caniuse-db": {
-      "version": "1.0.30000670",
+      "version": "1.0.30000709",
       "from": "caniuse-db@>=1.0.30000634 <2.0.0",
-      "resolved": "http://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000670.tgz"
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000709.tgz"
     },
     "capture-stack-trace": {
       "version": "1.0.0",
@@ -1865,26 +1877,114 @@
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz"
     },
     "chromedriver": {
-      "version": "2.29.0",
+      "version": "2.31.0",
       "from": "chromedriver@>=2.27.2 <3.0.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.29.0.tgz",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.31.0.tgz",
+      "dev": true,
+      "dependencies": {
+        "caseless": {
+          "version": "0.12.0",
+          "from": "caseless@>=0.12.0 <0.13.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+          "dev": true
+        },
+        "concat-stream": {
+          "version": "1.6.0",
+          "from": "concat-stream@1.6.0",
+          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.2.0",
+          "from": "debug@2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "dev": true
+        },
+        "extract-zip": {
+          "version": "1.6.5",
+          "from": "extract-zip@>=1.6.5 <2.0.0",
+          "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.5.tgz",
+          "dev": true,
+          "dependencies": {
+            "mkdirp": {
+              "version": "0.5.0",
+              "from": "mkdirp@0.5.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+              "dev": true
+            }
+          }
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "from": "form-data@>=2.1.1 <2.2.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+          "dev": true
+        },
+        "har-validator": {
+          "version": "4.2.1",
+          "from": "har-validator@>=4.2.1 <4.3.0",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+          "dev": true
+        },
+        "ms": {
+          "version": "0.7.1",
+          "from": "ms@0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "dev": true
+        },
+        "qs": {
+          "version": "6.4.0",
+          "from": "qs@>=6.4.0 <6.5.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.3",
+          "from": "readable-stream@>=2.2.2 <3.0.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+          "dev": true
+        },
+        "request": {
+          "version": "2.81.0",
+          "from": "request@>=2.81.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "1.0.3",
+          "from": "string_decoder@>=1.0.3 <1.1.0",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+          "dev": true
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "from": "tunnel-agent@>=0.6.0 <0.7.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+          "dev": true
+        },
+        "yauzl": {
+          "version": "2.4.1",
+          "from": "yauzl@2.4.1",
+          "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
+          "dev": true
+        }
+      }
     },
     "cipher-base": {
-      "version": "1.0.3",
+      "version": "1.0.4",
       "from": "cipher-base@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz"
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"
     },
     "circular-json": {
-      "version": "0.3.1",
+      "version": "0.3.3",
       "from": "circular-json@>=0.3.1 <0.4.0",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
       "dev": true
     },
     "clap": {
-      "version": "1.1.3",
+      "version": "1.2.0",
       "from": "clap@>=1.0.9 <2.0.0",
-      "resolved": "https://registry.npmjs.org/clap/-/clap-1.1.3.tgz"
+      "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz"
     },
     "clean-css": {
       "version": "2.2.23",
@@ -1930,9 +2030,16 @@
       "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"
     },
     "clone-deep": {
-      "version": "0.2.4",
-      "from": "clone-deep@>=0.2.4 <0.3.0",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz"
+      "version": "0.3.0",
+      "from": "clone-deep@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.3.0.tgz",
+      "dependencies": {
+        "for-own": {
+          "version": "1.0.0",
+          "from": "for-own@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz"
+        }
+      }
     },
     "clone-stats": {
       "version": "0.0.1",
@@ -1945,9 +2052,9 @@
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz"
     },
     "coa": {
-      "version": "1.0.1",
+      "version": "1.0.4",
       "from": "coa@>=1.0.1 <1.1.0",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.1.tgz"
+      "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz"
     },
     "code-point-at": {
       "version": "1.1.0",
@@ -1970,9 +2077,9 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz"
     },
     "color-name": {
-      "version": "1.1.2",
+      "version": "1.1.3",
       "from": "color-name@>=1.1.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
     },
     "color-string": {
       "version": "0.3.0",
@@ -2013,47 +2120,15 @@
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
     },
     "commander": {
-      "version": "2.9.0",
+      "version": "2.11.0",
       "from": "commander@>=2.9.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"
     },
     "commondir": {
       "version": "1.0.1",
       "from": "commondir@>=1.0.1 <2.0.0",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"
     },
-    "commoner": {
-      "version": "0.10.8",
-      "from": "commoner@>=0.10.3 <0.11.0",
-      "resolved": "https://registry.npmjs.org/commoner/-/commoner-0.10.8.tgz",
-      "dev": true,
-      "dependencies": {
-        "ast-types": {
-          "version": "0.9.6",
-          "from": "ast-types@0.9.6",
-          "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz",
-          "dev": true
-        },
-        "esprima": {
-          "version": "3.1.3",
-          "from": "esprima@>=3.1.0 <3.2.0",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-          "dev": true
-        },
-        "glob": {
-          "version": "5.0.15",
-          "from": "glob@>=5.0.15 <6.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-          "dev": true
-        },
-        "recast": {
-          "version": "0.11.23",
-          "from": "recast@>=0.11.17 <0.12.0",
-          "resolved": "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz",
-          "dev": true
-        }
-      }
-    },
     "component-bind": {
       "version": "1.0.0",
       "from": "component-bind@1.0.0",
@@ -2072,29 +2147,19 @@
       "dev": true
     },
     "compressible": {
-      "version": "2.0.10",
-      "from": "compressible@>=2.0.8 <2.1.0",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz"
+      "version": "2.0.11",
+      "from": "compressible@>=2.0.10 <2.1.0",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.11.tgz"
     },
     "compression": {
-      "version": "1.6.2",
+      "version": "1.7.0",
       "from": "compression@>=1.6.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.6.2.tgz",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.0.tgz",
       "dependencies": {
         "bytes": {
-          "version": "2.3.0",
-          "from": "bytes@2.3.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.3.0.tgz"
-        },
-        "debug": {
-          "version": "2.2.0",
-          "from": "debug@>=2.2.0 <2.3.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
-        },
-        "ms": {
-          "version": "0.7.1",
-          "from": "ms@0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
+          "version": "2.5.0",
+          "from": "bytes@2.5.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz"
         }
       }
     },
@@ -2141,6 +2206,12 @@
       "resolved": "http://registry.npmjs.org/connect/-/connect-3.6.2.tgz",
       "dev": true,
       "dependencies": {
+        "debug": {
+          "version": "2.6.7",
+          "from": "debug@2.6.7",
+          "resolved": "http://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
+          "dev": true
+        },
         "finalhandler": {
           "version": "1.0.3",
           "from": "finalhandler@1.0.3",
@@ -2278,9 +2349,9 @@
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
     },
     "cosmiconfig": {
-      "version": "2.1.3",
+      "version": "2.2.2",
       "from": "cosmiconfig@>=2.1.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
       "dependencies": {
         "minimist": {
           "version": "1.2.0",
@@ -2379,15 +2450,15 @@
       "dev": true,
       "dependencies": {
         "lru-cache": {
-          "version": "4.0.2",
+          "version": "4.1.1",
           "from": "lru-cache@>=4.0.1 <5.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
           "dev": true
         },
         "which": {
-          "version": "1.2.14",
+          "version": "1.3.0",
           "from": "which@>=1.2.9 <2.0.0",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
           "dev": true
         }
       }
@@ -2420,9 +2491,9 @@
       "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz"
     },
     "css-loader": {
-      "version": "0.28.1",
+      "version": "0.28.4",
       "from": "css-loader@>=0.28.0 <0.29.0",
-      "resolved": "http://registry.npmjs.org/css-loader/-/css-loader-0.28.1.tgz",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.4.tgz",
       "dependencies": {
         "loader-utils": {
           "version": "1.1.0",
@@ -2507,7 +2578,7 @@
     },
     "cwait": {
       "version": "1.0.1",
-      "from": "cwait@>=1.0.0 <2.0.0",
+      "from": "cwait@1.0.1",
       "resolved": "https://registry.npmjs.org/cwait/-/cwait-1.0.1.tgz"
     },
     "cwise": {
@@ -2516,16 +2587,16 @@
       "resolved": "https://registry.npmjs.org/cwise/-/cwise-1.0.10.tgz",
       "dependencies": {
         "uglify-js": {
-          "version": "2.8.26",
+          "version": "2.8.29",
           "from": "uglify-js@>=2.6.0 <3.0.0",
-          "resolved": "http://registry.npmjs.org/uglify-js/-/uglify-js-2.8.26.tgz"
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz"
         }
       }
     },
     "cwise-compiler": {
-      "version": "1.1.2",
+      "version": "1.1.3",
       "from": "cwise-compiler@>=1.1.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/cwise-compiler/-/cwise-compiler-1.1.2.tgz"
+      "resolved": "https://registry.npmjs.org/cwise-compiler/-/cwise-compiler-1.1.3.tgz"
     },
     "cwise-parser": {
       "version": "1.0.3",
@@ -2580,9 +2651,9 @@
       "resolved": "https://registry.npmjs.org/deap/-/deap-1.0.0.tgz"
     },
     "debug": {
-      "version": "2.6.7",
+      "version": "2.6.8",
       "from": "debug@>=2.0.0 <3.0.0",
-      "resolved": "http://registry.npmjs.org/debug/-/debug-2.6.7.tgz"
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz"
     },
     "debug-fabulous": {
       "version": "0.0.4",
@@ -2898,35 +2969,9 @@
       "from": "defined@>=1.0.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"
     },
-    "defs": {
-      "version": "1.1.1",
-      "from": "defs@>=1.1.0 <1.2.0",
-      "resolved": "https://registry.npmjs.org/defs/-/defs-1.1.1.tgz",
-      "dev": true,
-      "dependencies": {
-        "esprima-fb": {
-          "version": "15001.1001.0-dev-harmony-fb",
-          "from": "esprima-fb@~15001.1001.0-dev-harmony-fb",
-          "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz",
-          "dev": true
-        },
-        "window-size": {
-          "version": "0.1.4",
-          "from": "window-size@>=0.1.2 <0.2.0",
-          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
-          "dev": true
-        },
-        "yargs": {
-          "version": "3.27.0",
-          "from": "yargs@>=3.27.0 <3.28.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.27.0.tgz",
-          "dev": true
-        }
-      }
-    },
     "degenerator": {
       "version": "1.0.4",
-      "from": "degenerator@>=1.0.0 <1.1.0",
+      "from": "degenerator@>=1.0.2 <1.1.0",
       "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz",
       "dev": true,
       "dependencies": {
@@ -2939,9 +2984,16 @@
       }
     },
     "del": {
-      "version": "2.2.2",
-      "from": "del@>=2.2.2 <3.0.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz"
+      "version": "3.0.0",
+      "from": "del@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
+      "dependencies": {
+        "pify": {
+          "version": "3.0.0",
+          "from": "pify@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"
+        }
+      }
     },
     "delayed-stream": {
       "version": "1.0.0",
@@ -2954,9 +3006,9 @@
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
     },
     "depd": {
-      "version": "1.1.0",
+      "version": "1.1.1",
       "from": "depd@>=1.1.0 <1.2.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz"
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz"
     },
     "deprecated": {
       "version": "0.0.1",
@@ -3055,6 +3107,11 @@
         }
       }
     },
+    "dom-walk": {
+      "version": "0.1.1",
+      "from": "dom-walk@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz"
+    },
     "domain-browser": {
       "version": "1.1.7",
       "from": "domain-browser@>=1.1.0 <1.2.0",
@@ -3229,9 +3286,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.11",
+      "version": "1.3.16",
       "from": "electron-to-chromium@>=1.2.7 <2.0.0",
-      "resolved": "http://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.11.tgz"
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.16.tgz"
     },
     "elliptic": {
       "version": "6.4.0",
@@ -3325,9 +3382,9 @@
       "dev": true
     },
     "enhanced-resolve": {
-      "version": "3.1.0",
-      "from": "enhanced-resolve@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz"
+      "version": "3.4.1",
+      "from": "enhanced-resolve@>=3.3.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz"
     },
     "ent": {
       "version": "2.2.0",
@@ -3351,9 +3408,9 @@
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz"
     },
     "es5-ext": {
-      "version": "0.10.20",
+      "version": "0.10.24",
       "from": "es5-ext@>=0.10.6 <0.11.0",
-      "resolved": "http://registry.npmjs.org/es5-ext/-/es5-ext-0.10.20.tgz"
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.24.tgz"
     },
     "es6-iterator": {
       "version": "2.0.1",
@@ -3500,9 +3557,9 @@
           "dev": true
         },
         "glob": {
-          "version": "7.1.1",
+          "version": "7.1.2",
           "from": "glob@>=7.0.3 <8.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
           "dev": true
         },
         "inquirer": {
@@ -3564,9 +3621,9 @@
       }
     },
     "eslint-loader": {
-      "version": "1.7.1",
+      "version": "1.9.0",
       "from": "eslint-loader@>=1.3.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-1.7.1.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-1.9.0.tgz",
       "dev": true,
       "dependencies": {
         "loader-utils": {
@@ -3598,16 +3655,16 @@
       }
     },
     "eslint-plugin-lodash": {
-      "version": "2.4.2",
+      "version": "2.4.4",
       "from": "eslint-plugin-lodash@>=2.3.5 <3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-lodash/-/eslint-plugin-lodash-2.4.2.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-lodash/-/eslint-plugin-lodash-2.4.4.tgz",
       "dev": true,
       "optional": true
     },
     "eslint-plugin-mocha": {
-      "version": "4.9.0",
+      "version": "4.11.0",
       "from": "eslint-plugin-mocha@>=4.7.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-4.9.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-4.11.0.tgz",
       "dev": true
     },
     "espree": {
@@ -3617,9 +3674,9 @@
       "dev": true,
       "dependencies": {
         "acorn": {
-          "version": "5.0.3",
+          "version": "5.1.1",
           "from": "acorn@>=5.0.1 <6.0.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz",
           "dev": true
         }
       }
@@ -3636,18 +3693,10 @@
       "dev": true
     },
     "esrecurse": {
-      "version": "4.1.0",
+      "version": "4.2.0",
       "from": "esrecurse@>=4.1.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.1.0.tgz",
-      "dev": true,
-      "dependencies": {
-        "estraverse": {
-          "version": "4.1.1",
-          "from": "estraverse@>=4.1.0 <4.2.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz",
-          "dev": true
-        }
-      }
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz",
+      "dev": true
     },
     "estraverse": {
       "version": "4.2.0",
@@ -3693,7 +3742,7 @@
     },
     "events": {
       "version": "1.1.1",
-      "from": "events@>=1.1.0 <1.2.0",
+      "from": "events@>=1.1.1 <2.0.0",
       "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz"
     },
     "eventsource-polyfill": {
@@ -3742,6 +3791,12 @@
       "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
       "dev": true,
       "dependencies": {
+        "array-slice": {
+          "version": "0.2.3",
+          "from": "array-slice@>=0.2.3 <0.3.0",
+          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+          "dev": true
+        },
         "braces": {
           "version": "0.1.5",
           "from": "braces@>=0.1.2 <0.2.0",
@@ -3812,9 +3867,9 @@
       }
     },
     "express-basic-auth": {
-      "version": "1.0.2",
+      "version": "1.1.1",
       "from": "express-basic-auth@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/express-basic-auth/-/express-basic-auth-1.0.2.tgz"
+      "resolved": "https://registry.npmjs.org/express-basic-auth/-/express-basic-auth-1.1.1.tgz"
     },
     "express-csv": {
       "version": "0.6.0",
@@ -3859,14 +3914,14 @@
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz"
     },
     "extract-text-webpack-plugin": {
-      "version": "2.1.0",
+      "version": "2.1.2",
       "from": "extract-text-webpack-plugin@>=2.0.0-rc.3 <3.0.0",
-      "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.2.tgz",
       "dependencies": {
         "async": {
-          "version": "2.4.0",
+          "version": "2.5.0",
           "from": "async@>=2.1.2 <3.0.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.4.0.tgz"
+          "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz"
         },
         "loader-utils": {
           "version": "1.1.0",
@@ -3913,14 +3968,14 @@
       "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
     },
     "falafel": {
-      "version": "1.2.0",
-      "from": "falafel@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/falafel/-/falafel-1.2.0.tgz",
+      "version": "2.1.0",
+      "from": "falafel@>=2.1.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/falafel/-/falafel-2.1.0.tgz",
       "dependencies": {
         "acorn": {
-          "version": "1.2.2",
-          "from": "acorn@>=1.0.3 <2.0.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
+          "version": "5.1.1",
+          "from": "acorn@>=5.0.0 <6.0.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz"
         },
         "isarray": {
           "version": "0.0.1",
@@ -3934,6 +3989,11 @@
       "from": "fancy-log@>=1.1.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz"
     },
+    "fast-deep-equal": {
+      "version": "1.0.0",
+      "from": "fast-deep-equal@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz"
+    },
     "fast-levenshtein": {
       "version": "2.0.6",
       "from": "fast-levenshtein@>=2.0.4 <2.1.0",
@@ -3984,9 +4044,9 @@
       "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz"
     },
     "file-uri-to-path": {
-      "version": "0.0.2",
-      "from": "file-uri-to-path@>=0.0.0 <1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-0.0.2.tgz",
+      "version": "1.0.0",
+      "from": "file-uri-to-path@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
       "dev": true
     },
     "file-url": {
@@ -4021,17 +4081,17 @@
       "dev": true,
       "dependencies": {
         "glob": {
-          "version": "7.1.1",
+          "version": "7.1.2",
           "from": "glob@>=7.0.3 <8.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
           "dev": true
         }
       }
     },
     "filesize": {
-      "version": "3.5.9",
+      "version": "3.5.10",
       "from": "filesize@>=3.5.9 <4.0.0",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.9.tgz",
+      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.10.tgz",
       "dev": true
     },
     "fill-range": {
@@ -4100,9 +4160,16 @@
       }
     },
     "fined": {
-      "version": "1.0.2",
+      "version": "1.1.0",
       "from": "fined@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/fined/-/fined-1.0.2.tgz"
+      "resolved": "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz",
+      "dependencies": {
+        "expand-tilde": {
+          "version": "2.0.2",
+          "from": "expand-tilde@>=2.0.2 <3.0.0",
+          "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"
+        }
+      }
     },
     "first-chunk-stream": {
       "version": "1.0.0",
@@ -4118,7 +4185,27 @@
       "version": "1.2.2",
       "from": "flat-cache@>=1.2.1 <2.0.0",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz",
-      "dev": true
+      "dev": true,
+      "dependencies": {
+        "del": {
+          "version": "2.2.2",
+          "from": "del@>=2.0.2 <3.0.0",
+          "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+          "dev": true
+        },
+        "glob": {
+          "version": "7.1.2",
+          "from": "glob@>=7.0.3 <8.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "dev": true
+        },
+        "globby": {
+          "version": "5.0.0",
+          "from": "globby@>=5.0.0 <6.0.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+          "dev": true
+        }
+      }
     },
     "flatten": {
       "version": "1.0.2",
@@ -4126,9 +4213,9 @@
       "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz"
     },
     "follow-redirects": {
-      "version": "1.2.3",
+      "version": "1.2.4",
       "from": "follow-redirects@>=1.2.3 <2.0.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.3.tgz"
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.4.tgz"
     },
     "for-in": {
       "version": "1.0.2",
@@ -4156,9 +4243,9 @@
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz",
       "dependencies": {
         "async": {
-          "version": "2.4.0",
+          "version": "2.5.0",
           "from": "async@>=2.0.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.4.0.tgz"
+          "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz"
         }
       }
     },
@@ -4194,9 +4281,9 @@
       "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz"
     },
     "fs-extra": {
-      "version": "2.0.0",
-      "from": "fs-extra@>=2.0.0 <2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.0.0.tgz"
+      "version": "3.0.1",
+      "from": "fs-extra@>=3.0.1 <3.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz"
     },
     "fs-write-stream-atomic": {
       "version": "1.0.10",
@@ -4208,6 +4295,662 @@
       "from": "fs.realpath@>=1.0.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
     },
+    "fsevents": {
+      "version": "1.1.2",
+      "from": "fsevents@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz",
+      "optional": true,
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.0",
+          "from": "abbrev@1.1.0",
+          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
+          "optional": true
+        },
+        "ajv": {
+          "version": "4.11.8",
+          "from": "ajv@4.11.8",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+          "optional": true
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "from": "ansi-regex@2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
+        },
+        "aproba": {
+          "version": "1.1.1",
+          "from": "aproba@1.1.1",
+          "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz",
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "from": "are-we-there-yet@1.1.4",
+          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
+          "optional": true
+        },
+        "asn1": {
+          "version": "0.2.3",
+          "from": "asn1@0.2.3",
+          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "from": "assert-plus@0.2.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+          "optional": true
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "from": "asynckit@0.4.0",
+          "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+          "optional": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "from": "aws-sign2@0.6.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+          "optional": true
+        },
+        "aws4": {
+          "version": "1.6.0",
+          "from": "aws4@1.6.0",
+          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+          "optional": true
+        },
+        "balanced-match": {
+          "version": "0.4.2",
+          "from": "balanced-match@0.4.2",
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
+        },
+        "bcrypt-pbkdf": {
+          "version": "1.0.1",
+          "from": "bcrypt-pbkdf@1.0.1",
+          "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+          "optional": true
+        },
+        "block-stream": {
+          "version": "0.0.9",
+          "from": "block-stream@0.0.9",
+          "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"
+        },
+        "boom": {
+          "version": "2.10.1",
+          "from": "boom@2.10.1",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
+        },
+        "brace-expansion": {
+          "version": "1.1.7",
+          "from": "brace-expansion@1.1.7",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz"
+        },
+        "buffer-shims": {
+          "version": "1.0.0",
+          "from": "buffer-shims@1.0.0",
+          "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"
+        },
+        "caseless": {
+          "version": "0.12.0",
+          "from": "caseless@0.12.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+          "optional": true
+        },
+        "co": {
+          "version": "4.6.0",
+          "from": "co@4.6.0",
+          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "from": "code-point-at@1.1.0",
+          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"
+        },
+        "combined-stream": {
+          "version": "1.0.5",
+          "from": "combined-stream@1.0.5",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "from": "concat-map@0.0.1",
+          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "from": "console-control-strings@1.1.0",
+          "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "from": "core-util-is@1.0.2",
+          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "from": "cryptiles@2.0.5",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+          "optional": true
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "from": "dashdash@1.14.1",
+          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+          "optional": true,
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "from": "assert-plus@1.0.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+              "optional": true
+            }
+          }
+        },
+        "debug": {
+          "version": "2.6.8",
+          "from": "debug@2.6.8",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "optional": true
+        },
+        "deep-extend": {
+          "version": "0.4.2",
+          "from": "deep-extend@0.4.2",
+          "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
+          "optional": true
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "from": "delayed-stream@1.0.0",
+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "from": "delegates@1.0.0",
+          "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+          "optional": true
+        },
+        "ecc-jsbn": {
+          "version": "0.1.1",
+          "from": "ecc-jsbn@0.1.1",
+          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+          "optional": true
+        },
+        "extend": {
+          "version": "3.0.1",
+          "from": "extend@3.0.1",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+          "optional": true
+        },
+        "extsprintf": {
+          "version": "1.0.2",
+          "from": "extsprintf@1.0.2",
+          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "from": "forever-agent@0.6.1",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+          "optional": true
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "from": "form-data@2.1.4",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+          "optional": true
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "from": "fs.realpath@1.0.0",
+          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
+        },
+        "fstream": {
+          "version": "1.0.11",
+          "from": "fstream@1.0.11",
+          "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz"
+        },
+        "fstream-ignore": {
+          "version": "1.0.5",
+          "from": "fstream-ignore@1.0.5",
+          "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+          "optional": true
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "from": "gauge@2.7.4",
+          "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+          "optional": true
+        },
+        "getpass": {
+          "version": "0.1.7",
+          "from": "getpass@0.1.7",
+          "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+          "optional": true,
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "from": "assert-plus@1.0.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+              "optional": true
+            }
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "from": "glob@7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"
+        },
+        "graceful-fs": {
+          "version": "4.1.11",
+          "from": "graceful-fs@4.1.11",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"
+        },
+        "har-schema": {
+          "version": "1.0.5",
+          "from": "har-schema@1.0.5",
+          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
+          "optional": true
+        },
+        "har-validator": {
+          "version": "4.2.1",
+          "from": "har-validator@4.2.1",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+          "optional": true
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "from": "has-unicode@2.0.1",
+          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+          "optional": true
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "from": "hawk@3.1.3",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+          "optional": true
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "from": "hoek@2.16.3",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "from": "http-signature@1.1.1",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+          "optional": true
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "from": "inflight@1.0.6",
+          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "from": "inherits@2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+        },
+        "ini": {
+          "version": "1.3.4",
+          "from": "ini@1.3.4",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "from": "is-fullwidth-code-point@1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "from": "is-typedarray@1.0.0",
+          "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+          "optional": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "from": "isstream@0.1.2",
+          "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+          "optional": true
+        },
+        "jodid25519": {
+          "version": "1.0.2",
+          "from": "jodid25519@1.0.2",
+          "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz",
+          "optional": true
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "from": "jsbn@0.1.1",
+          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+          "optional": true
+        },
+        "json-schema": {
+          "version": "0.2.3",
+          "from": "json-schema@0.2.3",
+          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+          "optional": true
+        },
+        "json-stable-stringify": {
+          "version": "1.0.1",
+          "from": "json-stable-stringify@1.0.1",
+          "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+          "optional": true
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "from": "json-stringify-safe@5.0.1",
+          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+          "optional": true
+        },
+        "jsonify": {
+          "version": "0.0.0",
+          "from": "jsonify@0.0.0",
+          "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+          "optional": true
+        },
+        "jsprim": {
+          "version": "1.4.0",
+          "from": "jsprim@1.4.0",
+          "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
+          "optional": true,
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "from": "assert-plus@1.0.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+              "optional": true
+            }
+          }
+        },
+        "mime-db": {
+          "version": "1.27.0",
+          "from": "mime-db@1.27.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"
+        },
+        "mime-types": {
+          "version": "2.1.15",
+          "from": "mime-types@2.1.15",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "from": "minimatch@3.0.4",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "from": "minimist@0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "from": "mkdirp@0.5.1",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
+        },
+        "ms": {
+          "version": "2.0.0",
+          "from": "ms@2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "optional": true
+        },
+        "node-pre-gyp": {
+          "version": "0.6.36",
+          "from": "node-pre-gyp@^0.6.36",
+          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
+          "optional": true
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "from": "nopt@4.0.1",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+          "optional": true
+        },
+        "npmlog": {
+          "version": "4.1.0",
+          "from": "npmlog@4.1.0",
+          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz",
+          "optional": true
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "from": "number-is-nan@1.0.1",
+          "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
+        },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "from": "oauth-sign@0.8.2",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "from": "object-assign@4.1.1",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "from": "once@1.4.0",
+          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "from": "os-homedir@1.0.2",
+          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "from": "os-tmpdir@1.0.2",
+          "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.4",
+          "from": "osenv@0.1.4",
+          "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
+          "optional": true
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "from": "path-is-absolute@1.0.1",
+          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+        },
+        "performance-now": {
+          "version": "0.2.0",
+          "from": "performance-now@0.2.0",
+          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "from": "process-nextick-args@1.0.7",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "from": "punycode@1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "optional": true
+        },
+        "qs": {
+          "version": "6.4.0",
+          "from": "qs@6.4.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.1",
+          "from": "rc@1.2.1",
+          "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
+          "optional": true,
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "from": "minimist@1.2.0",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.2.9",
+          "from": "readable-stream@2.2.9",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz"
+        },
+        "request": {
+          "version": "2.81.0",
+          "from": "request@2.81.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+          "optional": true
+        },
+        "rimraf": {
+          "version": "2.6.1",
+          "from": "rimraf@2.6.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz"
+        },
+        "safe-buffer": {
+          "version": "5.0.1",
+          "from": "safe-buffer@5.0.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"
+        },
+        "semver": {
+          "version": "5.3.0",
+          "from": "semver@5.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "from": "set-blocking@2.0.0",
+          "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "from": "signal-exit@3.0.2",
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+          "optional": true
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "from": "sntp@1.0.9",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+          "optional": true
+        },
+        "sshpk": {
+          "version": "1.13.0",
+          "from": "sshpk@1.13.0",
+          "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz",
+          "optional": true,
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "from": "assert-plus@1.0.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+              "optional": true
+            }
+          }
+        },
+        "string_decoder": {
+          "version": "1.0.1",
+          "from": "string_decoder@1.0.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz"
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "from": "string-width@1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "from": "stringstream@0.0.5",
+          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+          "optional": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "from": "strip-ansi@3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "from": "strip-json-comments@2.0.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+          "optional": true
+        },
+        "tar": {
+          "version": "2.2.1",
+          "from": "tar@2.2.1",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"
+        },
+        "tar-pack": {
+          "version": "3.4.0",
+          "from": "tar-pack@3.4.0",
+          "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
+          "optional": true
+        },
+        "tough-cookie": {
+          "version": "2.3.2",
+          "from": "tough-cookie@2.3.2",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+          "optional": true
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "from": "tunnel-agent@0.6.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+          "optional": true
+        },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "from": "tweetnacl@0.14.5",
+          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+          "optional": true
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "from": "uid-number@0.0.6",
+          "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
+          "optional": true
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "from": "util-deprecate@1.0.2",
+          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+        },
+        "uuid": {
+          "version": "3.0.1",
+          "from": "uuid@3.0.1",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
+          "optional": true
+        },
+        "verror": {
+          "version": "1.3.6",
+          "from": "verror@1.3.6",
+          "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
+          "optional": true
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "from": "wide-align@1.1.2",
+          "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
+          "optional": true
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "from": "wrappy@1.0.2",
+          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+        }
+      }
+    },
     "fstream": {
       "version": "1.0.11",
       "from": "fstream@>=1.0.2 <2.0.0",
@@ -4220,7 +4963,7 @@
     },
     "ftp": {
       "version": "0.3.10",
-      "from": "ftp@>=0.3.5 <0.4.0",
+      "from": "ftp@>=0.3.10 <0.4.0",
       "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
       "dev": true,
       "dependencies": {
@@ -4294,10 +5037,18 @@
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"
     },
     "get-uri": {
-      "version": "1.1.0",
-      "from": "get-uri@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-1.1.0.tgz",
-      "dev": true
+      "version": "2.0.1",
+      "from": "get-uri@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.1.tgz",
+      "dev": true,
+      "dependencies": {
+        "data-uri-to-buffer": {
+          "version": "1.2.0",
+          "from": "data-uri-to-buffer@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz",
+          "dev": true
+        }
+      }
     },
     "getobject": {
       "version": "0.1.0",
@@ -4339,6 +5090,12 @@
       "resolved": "https://registry.npmjs.org/gifsicle/-/gifsicle-3.0.4.tgz",
       "optional": true
     },
+    "gitbook-plugin-github": {
+      "version": "2.0.0",
+      "from": "gitbook-plugin-github@2.0.0",
+      "resolved": "https://registry.npmjs.org/gitbook-plugin-github/-/gitbook-plugin-github-2.0.0.tgz",
+      "dev": true
+    },
     "glob": {
       "version": "4.5.3",
       "from": "glob@>=4.3.5 <5.0.0",
@@ -4398,6 +5155,18 @@
       "from": "glob2base@>=0.0.12 <0.0.13",
       "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz"
     },
+    "global": {
+      "version": "4.3.2",
+      "from": "global@>=4.3.2 <5.0.0",
+      "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz",
+      "dependencies": {
+        "process": {
+          "version": "0.5.2",
+          "from": "process@>=0.5.1 <0.6.0",
+          "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz"
+        }
+      }
+    },
     "global-modules": {
       "version": "0.2.3",
       "from": "global-modules@>=0.2.3 <0.3.0",
@@ -4409,26 +5178,26 @@
       "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
       "dependencies": {
         "which": {
-          "version": "1.2.14",
+          "version": "1.3.0",
           "from": "which@>=1.2.12 <2.0.0",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz"
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz"
         }
       }
     },
     "globals": {
-      "version": "9.17.0",
+      "version": "9.18.0",
       "from": "globals@>=9.0.0 <10.0.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-9.17.0.tgz"
+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"
     },
     "globby": {
-      "version": "5.0.0",
-      "from": "globby@>=5.0.0 <6.0.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+      "version": "6.1.0",
+      "from": "globby@>=6.1.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
       "dependencies": {
         "glob": {
-          "version": "7.1.1",
+          "version": "7.1.2",
           "from": "glob@>=7.0.3 <8.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"
         }
       }
     },
@@ -4823,9 +5592,9 @@
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
         },
         "uglify-js": {
-          "version": "2.8.26",
+          "version": "2.8.29",
           "from": "uglify-js@>=2.4.0 <3.0.0",
-          "resolved": "http://registry.npmjs.org/uglify-js/-/uglify-js-2.8.26.tgz"
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz"
         }
       }
     },
@@ -5415,9 +6184,9 @@
       "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz"
     },
     "hash.js": {
-      "version": "1.0.3",
+      "version": "1.1.3",
       "from": "hash.js@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz"
     },
     "hasha": {
       "version": "2.2.0",
@@ -5470,9 +6239,9 @@
       "resolved": "https://registry.npmjs.org/hooks-fixed/-/hooks-fixed-2.0.0.tgz"
     },
     "hosted-git-info": {
-      "version": "2.4.2",
+      "version": "2.5.0",
       "from": "hosted-git-info@>=2.1.4 <3.0.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz"
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz"
     },
     "html-comment-regex": {
       "version": "1.1.1",
@@ -5486,26 +6255,26 @@
       "dev": true
     },
     "html-minifier": {
-      "version": "3.5.0",
+      "version": "3.5.3",
       "from": "html-minifier@>=3.2.3 <4.0.0",
-      "resolved": "http://registry.npmjs.org/html-minifier/-/html-minifier-3.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.3.tgz",
       "dependencies": {
         "clean-css": {
-          "version": "4.1.2",
+          "version": "4.1.7",
           "from": "clean-css@>=4.1.0 <4.2.0",
-          "resolved": "http://registry.npmjs.org/clean-css/-/clean-css-4.1.2.tgz"
+          "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.7.tgz"
         },
         "uglify-js": {
-          "version": "3.0.7",
+          "version": "3.0.27",
           "from": "uglify-js@>=3.0.0 <3.1.0",
-          "resolved": "http://registry.npmjs.org/uglify-js/-/uglify-js-3.0.7.tgz"
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.27.tgz"
         }
       }
     },
     "html-webpack-plugin": {
-      "version": "2.28.0",
+      "version": "2.30.1",
       "from": "html-webpack-plugin@>=2.8.1 <3.0.0",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-2.28.0.tgz"
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-2.30.1.tgz"
     },
     "htmlescape": {
       "version": "1.1.1",
@@ -5537,7 +6306,14 @@
     "http-errors": {
       "version": "1.6.1",
       "from": "http-errors@>=1.6.1 <1.7.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz"
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz",
+      "dependencies": {
+        "depd": {
+          "version": "1.1.0",
+          "from": "depd@1.1.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz"
+        }
+      }
     },
     "http-proxy": {
       "version": "1.16.2",
@@ -5589,9 +6365,9 @@
       }
     },
     "httpreq": {
-      "version": "0.4.23",
+      "version": "0.4.24",
       "from": "httpreq@>=0.4.22",
-      "resolved": "https://registry.npmjs.org/httpreq/-/httpreq-0.4.23.tgz"
+      "resolved": "https://registry.npmjs.org/httpreq/-/httpreq-0.4.24.tgz"
     },
     "https-browserify": {
       "version": "0.0.1",
@@ -5609,14 +6385,46 @@
       "resolved": "https://registry.npmjs.org/humanize-url/-/humanize-url-1.0.1.tgz"
     },
     "iconv-lite": {
-      "version": "0.4.17",
-      "from": "iconv-lite@>=0.4.15 <0.5.0",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz"
+      "version": "0.4.18",
+      "from": "iconv-lite@>=0.4.17 <0.5.0",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz"
     },
     "icss-replace-symbols": {
-      "version": "1.0.2",
-      "from": "icss-replace-symbols@>=1.0.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz"
+      "version": "1.1.0",
+      "from": "icss-replace-symbols@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz"
+    },
+    "icss-utils": {
+      "version": "2.1.0",
+      "from": "icss-utils@>=2.1.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz",
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.0",
+          "from": "ansi-styles@>=3.1.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz"
+        },
+        "chalk": {
+          "version": "2.0.1",
+          "from": "chalk@>=2.0.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz"
+        },
+        "has-flag": {
+          "version": "2.0.0",
+          "from": "has-flag@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"
+        },
+        "postcss": {
+          "version": "6.0.8",
+          "from": "postcss@>=6.0.1 <7.0.0",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.8.tgz"
+        },
+        "supports-color": {
+          "version": "4.2.1",
+          "from": "supports-color@>=4.2.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz"
+        }
+      }
     },
     "ieee754": {
       "version": "1.1.8",
@@ -5629,9 +6437,9 @@
       "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz"
     },
     "ignore": {
-      "version": "3.3.0",
+      "version": "3.3.3",
       "from": "ignore@>=3.2.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.3.tgz",
       "dev": true
     },
     "ignore-by-default": {
@@ -5813,9 +6621,9 @@
           "optional": true
         },
         "sax": {
-          "version": "1.2.2",
+          "version": "1.2.4",
           "from": "sax@>=1.2.1 <1.3.0",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
           "optional": true
         },
         "svgo": {
@@ -5832,24 +6640,39 @@
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
     },
     "in-app-purchase": {
-      "version": "1.3.1",
+      "version": "1.6.1",
       "from": "in-app-purchase@>=1.1.6 <2.0.0",
-      "resolved": "https://registry.npmjs.org/in-app-purchase/-/in-app-purchase-1.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/in-app-purchase/-/in-app-purchase-1.6.1.tgz",
       "dependencies": {
+        "caseless": {
+          "version": "0.12.0",
+          "from": "caseless@>=0.12.0 <0.13.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"
+        },
         "form-data": {
           "version": "2.1.4",
           "from": "form-data@>=2.1.1 <2.2.0",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"
         },
+        "har-validator": {
+          "version": "4.2.1",
+          "from": "har-validator@>=4.2.1 <4.3.0",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"
+        },
         "qs": {
-          "version": "6.3.2",
-          "from": "qs@>=6.3.0 <6.4.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz"
+          "version": "6.4.0",
+          "from": "qs@>=6.4.0 <6.5.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"
         },
         "request": {
-          "version": "2.79.0",
-          "from": "request@2.79.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz"
+          "version": "2.81.0",
+          "from": "request@2.81.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz"
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "from": "tunnel-agent@>=0.6.0 <0.7.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"
         }
       }
     },
@@ -5894,9 +6717,9 @@
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
     },
     "inject-loader": {
-      "version": "3.0.0",
+      "version": "3.0.1",
       "from": "inject-loader@>=3.0.0-beta4 <4.0.0",
-      "resolved": "https://registry.npmjs.org/inject-loader/-/inject-loader-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/inject-loader/-/inject-loader-3.0.1.tgz",
       "dev": true
     },
     "inline-source-map": {
@@ -6050,14 +6873,14 @@
       "optional": true
     },
     "ipaddr.js": {
-      "version": "1.3.0",
-      "from": "ipaddr.js@1.3.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz"
+      "version": "1.4.0",
+      "from": "ipaddr.js@1.4.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz"
     },
     "irregular-plurals": {
-      "version": "1.2.0",
+      "version": "1.3.0",
       "from": "irregular-plurals@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.2.0.tgz"
+      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.3.0.tgz"
     },
     "is-absolute": {
       "version": "0.2.6",
@@ -6100,9 +6923,9 @@
       "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz"
     },
     "is-dotfile": {
-      "version": "1.0.2",
+      "version": "1.0.3",
       "from": "is-dotfile@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz"
+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz"
     },
     "is-equal-shallow": {
       "version": "0.1.3",
@@ -6202,14 +7025,14 @@
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"
     },
     "is-plain-object": {
-      "version": "2.0.1",
-      "from": "is-plain-object@>=2.0.1 <3.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.1.tgz",
+      "version": "2.0.4",
+      "from": "is-plain-object@>=2.0.3 <3.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "dependencies": {
         "isobject": {
-          "version": "1.0.2",
-          "from": "isobject@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-1.0.2.tgz"
+          "version": "3.0.1",
+          "from": "isobject@>=3.0.1 <4.0.0",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"
         }
       }
     },
@@ -6359,9 +7182,9 @@
           "dev": true
         },
         "which": {
-          "version": "1.2.14",
+          "version": "1.3.0",
           "from": "which@>=1.1.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
           "dev": true
         },
         "wordwrap": {
@@ -6373,49 +7196,49 @@
       }
     },
     "istanbul-api": {
-      "version": "1.1.8",
+      "version": "1.1.11",
       "from": "istanbul-api@>=1.1.0-alpha <2.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.1.8.tgz",
+      "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.1.11.tgz",
       "dev": true,
       "dependencies": {
         "async": {
-          "version": "2.4.0",
+          "version": "2.5.0",
           "from": "async@>=2.1.4 <3.0.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.4.0.tgz",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
           "dev": true
         }
       }
     },
     "istanbul-lib-coverage": {
-      "version": "1.1.0",
-      "from": "istanbul-lib-coverage@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.0.tgz",
+      "version": "1.1.1",
+      "from": "istanbul-lib-coverage@>=1.1.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz",
       "dev": true
     },
     "istanbul-lib-hook": {
-      "version": "1.0.6",
-      "from": "istanbul-lib-hook@>=1.0.6 <2.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.0.6.tgz",
+      "version": "1.0.7",
+      "from": "istanbul-lib-hook@>=1.0.7 <2.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.0.7.tgz",
       "dev": true
     },
     "istanbul-lib-instrument": {
-      "version": "1.7.1",
-      "from": "istanbul-lib-instrument@>=1.7.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.1.tgz",
+      "version": "1.7.4",
+      "from": "istanbul-lib-instrument@>=1.7.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.4.tgz",
       "dev": true,
       "dependencies": {
         "semver": {
-          "version": "5.3.0",
+          "version": "5.4.1",
           "from": "semver@>=5.3.0 <6.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
           "dev": true
         }
       }
     },
     "istanbul-lib-report": {
-      "version": "1.1.0",
-      "from": "istanbul-lib-report@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.0.tgz",
+      "version": "1.1.1",
+      "from": "istanbul-lib-report@>=1.1.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz",
       "dev": true,
       "dependencies": {
         "supports-color": {
@@ -6427,21 +7250,21 @@
       }
     },
     "istanbul-lib-source-maps": {
-      "version": "1.2.0",
-      "from": "istanbul-lib-source-maps@>=1.2.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.0.tgz",
+      "version": "1.2.1",
+      "from": "istanbul-lib-source-maps@>=1.2.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.1.tgz",
       "dev": true
     },
     "istanbul-reports": {
-      "version": "1.1.0",
-      "from": "istanbul-reports@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.1.0.tgz",
+      "version": "1.1.1",
+      "from": "istanbul-reports@>=1.1.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.1.1.tgz",
       "dev": true,
       "dependencies": {
         "handlebars": {
-          "version": "4.0.8",
+          "version": "4.0.10",
           "from": "handlebars@>=4.0.3 <5.0.0",
-          "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.8.tgz",
+          "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz",
           "dev": true
         },
         "source-map": {
@@ -6451,9 +7274,9 @@
           "dev": true
         },
         "uglify-js": {
-          "version": "2.8.26",
+          "version": "2.8.29",
           "from": "uglify-js@>=2.6.0 <3.0.0",
-          "resolved": "http://registry.npmjs.org/uglify-js/-/uglify-js-2.8.26.tgz",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
           "dev": true,
           "optional": true,
           "dependencies": {
@@ -6474,9 +7297,9 @@
       "resolved": "https://registry.npmjs.org/jade/-/jade-1.11.0.tgz",
       "dependencies": {
         "clean-css": {
-          "version": "3.4.26",
+          "version": "3.4.28",
           "from": "clean-css@>=3.1.9 <4.0.0",
-          "resolved": "http://registry.npmjs.org/clean-css/-/clean-css-3.4.26.tgz",
+          "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz",
           "dependencies": {
             "commander": {
               "version": "2.8.1",
@@ -6496,9 +7319,9 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
         },
         "uglify-js": {
-          "version": "2.8.26",
+          "version": "2.8.29",
           "from": "uglify-js@>=2.4.19 <3.0.0",
-          "resolved": "http://registry.npmjs.org/uglify-js/-/uglify-js-2.8.26.tgz",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
           "dependencies": {
             "source-map": {
               "version": "0.5.6",
@@ -6546,12 +7369,6 @@
       "from": "jmespath@0.15.0",
       "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz"
     },
-    "jodid25519": {
-      "version": "1.0.2",
-      "from": "jodid25519@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz",
-      "optional": true
-    },
     "jpeg-js": {
       "version": "0.1.2",
       "from": "jpeg-js@>=0.1.1 <0.2.0",
@@ -6584,19 +7401,19 @@
       "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz"
     },
     "js-tokens": {
-      "version": "3.0.1",
+      "version": "3.0.2",
       "from": "js-tokens@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz"
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz"
     },
     "js-yaml": {
-      "version": "3.8.4",
+      "version": "3.9.1",
       "from": "js-yaml@>=3.1.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz",
       "dependencies": {
         "esprima": {
-          "version": "3.1.3",
-          "from": "esprima@>=3.1.1 <4.0.0",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"
+          "version": "4.0.0",
+          "from": "esprima@>=4.0.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"
         }
       }
     },
@@ -6622,15 +7439,20 @@
       "resolved": "https://registry.npmjs.org/json-content-demux/-/json-content-demux-0.1.3.tgz"
     },
     "json-loader": {
-      "version": "0.5.4",
+      "version": "0.5.7",
       "from": "json-loader@>=0.5.4 <0.6.0",
-      "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz"
+      "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz"
     },
     "json-schema": {
       "version": "0.2.3",
       "from": "json-schema@0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"
     },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "from": "json-schema-traverse@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"
+    },
     "json-stable-stringify": {
       "version": "1.0.1",
       "from": "json-stable-stringify@>=1.0.1 <2.0.0",
@@ -6652,9 +7474,9 @@
       "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"
     },
     "jsonfile": {
-      "version": "2.4.0",
-      "from": "jsonfile@>=2.1.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"
+      "version": "3.0.1",
+      "from": "jsonfile@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz"
     },
     "jsonify": {
       "version": "0.0.0",
@@ -6699,9 +7521,9 @@
       "resolved": "https://registry.npmjs.org/junk/-/junk-1.0.3.tgz"
     },
     "kareem": {
-      "version": "1.4.1",
-      "from": "kareem@1.4.1",
-      "resolved": "https://registry.npmjs.org/kareem/-/kareem-1.4.1.tgz"
+      "version": "1.2.1",
+      "from": "kareem@1.2.1",
+      "resolved": "https://registry.npmjs.org/kareem/-/kareem-1.2.1.tgz"
     },
     "karma": {
       "version": "1.7.0",
@@ -6716,9 +7538,9 @@
           "dev": true
         },
         "glob": {
-          "version": "7.1.1",
+          "version": "7.1.2",
           "from": "glob@>=7.1.1 <8.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
           "dev": true
         },
         "lodash": {
@@ -6837,9 +7659,9 @@
           "dev": true
         },
         "handlebars": {
-          "version": "4.0.8",
+          "version": "4.0.10",
           "from": "handlebars@>=4.0.1 <5.0.0",
-          "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.8.tgz",
+          "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz",
           "dev": true,
           "dependencies": {
             "source-map": {
@@ -6869,16 +7691,16 @@
           "dev": true
         },
         "uglify-js": {
-          "version": "2.8.26",
+          "version": "2.8.29",
           "from": "uglify-js@>=2.6.0 <3.0.0",
-          "resolved": "http://registry.npmjs.org/uglify-js/-/uglify-js-2.8.26.tgz",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
           "dev": true,
           "optional": true
         },
         "which": {
-          "version": "1.2.14",
+          "version": "1.3.0",
           "from": "which@>=1.1.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
           "dev": true
         },
         "wordwrap": {
@@ -6948,9 +7770,9 @@
       }
     },
     "karma-webpack": {
-      "version": "2.0.3",
+      "version": "2.0.4",
       "from": "karma-webpack@>=2.0.2 <3.0.0",
-      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-2.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-2.0.4.tgz",
       "dev": true,
       "dependencies": {
         "async": {
@@ -6994,9 +7816,9 @@
       "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz"
     },
     "klaw-sync": {
-      "version": "1.1.2",
-      "from": "klaw-sync@>=1.0.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-1.1.2.tgz"
+      "version": "2.1.0",
+      "from": "klaw-sync@>=2.1.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-2.1.0.tgz"
     },
     "labeled-stream-splicer": {
       "version": "2.0.0",
@@ -7377,11 +8199,6 @@
       "from": "lodash.assign@>=3.0.0 <4.0.0",
       "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz"
     },
-    "lodash.assignwith": {
-      "version": "4.2.0",
-      "from": "lodash.assignwith@>=4.0.7 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz"
-    },
     "lodash.camelcase": {
       "version": "4.3.0",
       "from": "lodash.camelcase@>=4.3.0 <5.0.0",
@@ -7447,11 +8264,6 @@
       "from": "lodash.isarray@>=3.0.0 <4.0.0",
       "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
     },
-    "lodash.isempty": {
-      "version": "4.4.0",
-      "from": "lodash.isempty@>=4.2.1 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz"
-    },
     "lodash.isequal": {
       "version": "4.5.0",
       "from": "lodash.isequal@>=4.0.0 <5.0.0",
@@ -7508,11 +8320,6 @@
       "from": "lodash.now@>=2.4.1 <2.5.0",
       "resolved": "https://registry.npmjs.org/lodash.now/-/lodash.now-2.4.1.tgz"
     },
-    "lodash.pick": {
-      "version": "4.4.0",
-      "from": "lodash.pick@>=4.2.1 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz"
-    },
     "lodash.rest": {
       "version": "4.0.5",
       "from": "lodash.rest@>=4.0.0 <5.0.0",
@@ -7630,16 +8437,10 @@
       "from": "lowercase-keys@>=1.0.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"
     },
-    "lpad": {
-      "version": "2.0.1",
-      "from": "lpad@>=2.0.1 <3.0.0",
-      "resolved": "https://registry.npmjs.org/lpad/-/lpad-2.0.1.tgz",
-      "optional": true
-    },
     "lpad-align": {
-      "version": "1.1.0",
+      "version": "1.1.2",
       "from": "lpad-align@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/lpad-align/-/lpad-align-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/lpad-align/-/lpad-align-1.1.2.tgz",
       "optional": true
     },
     "lru-cache": {
@@ -7684,13 +8485,13 @@
     },
     "markdown-it": {
       "version": "8.3.1",
-      "from": "markdown-it@>=8.2.2 <9.0.0",
+      "from": "markdown-it@>=8.3.1 <9.0.0",
       "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.3.1.tgz"
     },
     "markdown-it-emoji": {
-      "version": "1.3.0",
+      "version": "1.4.0",
       "from": "markdown-it-emoji@>=1.1.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-1.3.0.tgz"
+      "resolved": "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz"
     },
     "markdown-it-link-attributes": {
       "version": "1.0.0",
@@ -7792,21 +8593,9 @@
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz"
     },
     "method-override": {
-      "version": "2.3.8",
+      "version": "2.3.9",
       "from": "method-override@>=2.3.5 <3.0.0",
-      "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.8.tgz",
-      "dependencies": {
-        "debug": {
-          "version": "2.6.3",
-          "from": "debug@2.6.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz"
-        },
-        "ms": {
-          "version": "0.7.2",
-          "from": "ms@0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"
-        }
-      }
+      "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.9.tgz"
     },
     "methods": {
       "version": "1.1.2",
@@ -7815,7 +8604,7 @@
     },
     "micromatch": {
       "version": "2.3.11",
-      "from": "micromatch@>=2.3.11 <3.0.0",
+      "from": "micromatch@>=2.3.7 <3.0.0",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"
     },
     "miller-rabin": {
@@ -7829,20 +8618,25 @@
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
     },
     "mime-db": {
-      "version": "1.27.0",
-      "from": "mime-db@>=1.27.0 <1.28.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"
+      "version": "1.29.0",
+      "from": "mime-db@>=1.29.0 <1.30.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz"
     },
     "mime-types": {
-      "version": "2.1.15",
+      "version": "2.1.16",
       "from": "mime-types@>=2.1.7 <2.2.0",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz"
     },
     "mimic-fn": {
       "version": "1.1.0",
       "from": "mimic-fn@>=1.0.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz"
     },
+    "min-document": {
+      "version": "2.19.0",
+      "from": "min-document@>=2.19.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz"
+    },
     "minimalistic-assert": {
       "version": "1.0.0",
       "from": "minimalistic-assert@>=1.0.0 <2.0.0",
@@ -7855,7 +8649,7 @@
     },
     "minimatch": {
       "version": "3.0.4",
-      "from": "minimatch@>=3.0.2 <4.0.0",
+      "from": "minimatch@>=3.0.4 <4.0.0",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
     },
     "minimist": {
@@ -7886,25 +8680,20 @@
       "resolved": "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz"
     },
     "mocha": {
-      "version": "3.4.1",
+      "version": "3.5.0",
       "from": "mocha@>=3.2.0 <4.0.0",
-      "resolved": "http://registry.npmjs.org/mocha/-/mocha-3.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.0.tgz",
       "dependencies": {
-        "debug": {
-          "version": "2.6.0",
-          "from": "debug@2.6.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz"
+        "commander": {
+          "version": "2.9.0",
+          "from": "commander@2.9.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
         },
         "glob": {
           "version": "7.1.1",
           "from": "glob@7.1.1",
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"
         },
-        "ms": {
-          "version": "0.7.2",
-          "from": "ms@0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"
-        },
         "supports-color": {
           "version": "3.1.2",
           "from": "supports-color@3.1.2",
@@ -7918,6 +8707,12 @@
       "resolved": "https://registry.npmjs.org/mocha-nightwatch/-/mocha-nightwatch-3.2.2.tgz",
       "dev": true,
       "dependencies": {
+        "commander": {
+          "version": "2.9.0",
+          "from": "commander@2.9.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+          "dev": true
+        },
         "debug": {
           "version": "2.2.0",
           "from": "debug@2.2.0",
@@ -7971,9 +8766,9 @@
       "resolved": "git://github.com/habitrpg/moment-recur.git#f147ef27bbc26ca67638385f3db4a44084c76626"
     },
     "mongodb": {
-      "version": "2.2.26",
-      "from": "mongodb@2.2.26",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.26.tgz",
+      "version": "2.2.24",
+      "from": "mongodb@2.2.24",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.24.tgz",
       "dependencies": {
         "es6-promise": {
           "version": "3.2.1",
@@ -7981,26 +8776,21 @@
           "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz"
         },
         "readable-stream": {
-          "version": "2.2.7",
-          "from": "readable-stream@2.2.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.7.tgz"
-        },
-        "string_decoder": {
-          "version": "1.0.0",
-          "from": "string_decoder@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.0.tgz"
+          "version": "2.1.5",
+          "from": "readable-stream@2.1.5",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"
         }
       }
     },
     "mongodb-core": {
-      "version": "2.1.10",
-      "from": "mongodb-core@2.1.10",
-      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.10.tgz"
+      "version": "2.1.8",
+      "from": "mongodb-core@2.1.8",
+      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.8.tgz"
     },
     "mongoose": {
-      "version": "4.9.9",
-      "from": "mongoose@>=4.8.6 <5.0.0",
-      "resolved": "http://registry.npmjs.org/mongoose/-/mongoose-4.9.9.tgz",
+      "version": "4.8.7",
+      "from": "mongoose@>=4.8.6 <4.9.0",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.8.7.tgz",
       "dependencies": {
         "async": {
           "version": "2.1.4",
@@ -8026,27 +8816,15 @@
       "dev": true
     },
     "monk": {
-      "version": "4.0.0",
+      "version": "4.1.0",
       "from": "monk@>=4.0.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/monk/-/monk-4.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/monk/-/monk-4.1.0.tgz",
       "dev": true
     },
     "morgan": {
-      "version": "1.8.1",
+      "version": "1.8.2",
       "from": "morgan@>=1.7.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.8.1.tgz",
-      "dependencies": {
-        "debug": {
-          "version": "2.6.1",
-          "from": "debug@2.6.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"
-        },
-        "ms": {
-          "version": "0.7.2",
-          "from": "ms@0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"
-        }
-      }
+      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.8.2.tgz"
     },
     "mout": {
       "version": "0.9.1",
@@ -8069,9 +8847,9 @@
       "resolved": "https://registry.npmjs.org/mpromise/-/mpromise-0.5.5.tgz"
     },
     "mquery": {
-      "version": "2.3.0",
-      "from": "mquery@2.3.0",
-      "resolved": "https://registry.npmjs.org/mquery/-/mquery-2.3.0.tgz",
+      "version": "2.2.3",
+      "from": "mquery@2.2.3",
+      "resolved": "https://registry.npmjs.org/mquery/-/mquery-2.2.3.tgz",
       "dependencies": {
         "bluebird": {
           "version": "2.10.2",
@@ -8264,9 +9042,9 @@
       }
     },
     "nightwatch": {
-      "version": "0.9.15",
+      "version": "0.9.16",
       "from": "nightwatch@>=0.9.12 <0.10.0",
-      "resolved": "https://registry.npmjs.org/nightwatch/-/nightwatch-0.9.15.tgz",
+      "resolved": "https://registry.npmjs.org/nightwatch/-/nightwatch-0.9.16.tgz",
       "dev": true,
       "dependencies": {
         "minimatch": {
@@ -8352,14 +9130,14 @@
       }
     },
     "node-gyp": {
-      "version": "3.6.1",
+      "version": "3.6.2",
       "from": "node-gyp@>=3.3.1 <4.0.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.1.tgz",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz",
       "dependencies": {
         "glob": {
-          "version": "7.1.1",
+          "version": "7.1.2",
           "from": "glob@>=7.0.3 <8.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"
         },
         "semver": {
           "version": "5.3.0",
@@ -8373,15 +9151,10 @@
       "from": "node-libs-browser@>=2.0.0 <3.0.0",
       "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz",
       "dependencies": {
-        "buffer": {
-          "version": "4.9.1",
-          "from": "buffer@>=4.3.0 <5.0.0",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"
-        },
         "crypto-browserify": {
-          "version": "3.11.0",
+          "version": "3.11.1",
           "from": "crypto-browserify@>=3.11.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz"
+          "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz"
         },
         "os-browserify": {
           "version": "0.2.1",
@@ -8389,9 +9162,9 @@
           "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz"
         },
         "timers-browserify": {
-          "version": "2.0.2",
+          "version": "2.0.3",
           "from": "timers-browserify@>=2.0.2 <3.0.0",
-          "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz"
+          "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.3.tgz"
         },
         "url": {
           "version": "0.11.0",
@@ -8455,9 +9228,9 @@
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"
         },
         "glob": {
-          "version": "7.1.1",
+          "version": "7.1.2",
           "from": "glob@>=7.0.5 <8.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"
         },
         "har-validator": {
           "version": "4.2.1",
@@ -8517,34 +9290,29 @@
           "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz"
         },
         "glob": {
-          "version": "7.1.1",
+          "version": "7.1.2",
           "from": "glob@>=7.0.3 <8.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"
         },
         "globule": {
-          "version": "1.1.0",
+          "version": "1.2.0",
           "from": "globule@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/globule/-/globule-1.1.0.tgz"
+          "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz"
         },
         "har-validator": {
           "version": "4.2.1",
           "from": "har-validator@>=4.2.1 <4.3.0",
           "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"
         },
-        "lodash": {
-          "version": "4.16.6",
-          "from": "lodash@>=4.16.4 <4.17.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.6.tgz"
-        },
         "lodash.assign": {
           "version": "4.2.0",
           "from": "lodash.assign@>=4.2.0 <5.0.0",
           "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"
         },
         "lru-cache": {
-          "version": "4.0.2",
+          "version": "4.1.1",
           "from": "lru-cache@>=4.0.1 <5.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz"
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz"
         },
         "qs": {
           "version": "6.4.0",
@@ -8562,9 +9330,9 @@
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"
         },
         "which": {
-          "version": "1.2.14",
+          "version": "1.3.0",
           "from": "which@>=1.2.9 <2.0.0",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz"
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz"
         }
       }
     },
@@ -8732,9 +9500,9 @@
       }
     },
     "normalize-package-data": {
-      "version": "2.3.8",
+      "version": "2.4.0",
       "from": "normalize-package-data@>=2.3.4 <3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz"
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"
     },
     "normalize-path": {
       "version": "2.1.1",
@@ -8774,9 +9542,9 @@
       }
     },
     "npmlog": {
-      "version": "4.1.0",
+      "version": "4.1.2",
       "from": "npmlog@>=4.0.1 <5.0.0",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz"
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"
     },
     "nth-check": {
       "version": "1.0.1",
@@ -8840,11 +9608,33 @@
       "from": "object-path@>=0.9.2 <0.10.0",
       "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.9.2.tgz"
     },
+    "object.defaults": {
+      "version": "1.1.0",
+      "from": "object.defaults@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
+      "dependencies": {
+        "for-own": {
+          "version": "1.0.0",
+          "from": "for-own@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz"
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "from": "isobject@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"
+        }
+      }
+    },
     "object.omit": {
       "version": "2.0.1",
       "from": "object.omit@>=2.0.0 <3.0.0",
       "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz"
     },
+    "object.pick": {
+      "version": "1.2.0",
+      "from": "object.pick@>=1.2.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.2.0.tgz"
+    },
     "omggif": {
       "version": "1.0.8",
       "from": "omggif@>=1.0.5 <2.0.0",
@@ -8887,9 +9677,9 @@
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"
     },
     "optional": {
-      "version": "0.1.3",
+      "version": "0.1.4",
       "from": "optional@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/optional/-/optional-0.1.3.tgz"
+      "resolved": "https://registry.npmjs.org/optional/-/optional-0.1.4.tgz"
     },
     "optionator": {
       "version": "0.8.2",
@@ -8917,9 +9707,9 @@
       "optional": true
     },
     "ora": {
-      "version": "1.2.0",
+      "version": "1.3.0",
       "from": "ora@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-1.2.0.tgz"
+      "resolved": "https://registry.npmjs.org/ora/-/ora-1.3.0.tgz"
     },
     "orchestrator": {
       "version": "0.3.8",
@@ -9003,6 +9793,11 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
       "dev": true
     },
+    "p-map": {
+      "version": "1.1.1",
+      "from": "p-map@>=1.1.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.1.1.tgz"
+    },
     "p-throttler": {
       "version": "0.1.0",
       "from": "p-throttler@0.1.0",
@@ -9016,15 +9811,15 @@
       }
     },
     "pac-proxy-agent": {
-      "version": "1.0.0",
+      "version": "1.1.0",
       "from": "pac-proxy-agent@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-1.1.0.tgz",
       "dev": true
     },
     "pac-resolver": {
-      "version": "1.2.6",
-      "from": "pac-resolver@>=1.2.1 <1.3.0",
-      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-1.2.6.tgz",
+      "version": "2.0.0",
+      "from": "pac-resolver@>=2.0.0 <2.1.0",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-2.0.0.tgz",
       "dev": true,
       "dependencies": {
         "co": {
@@ -9032,6 +9827,12 @@
           "from": "co@>=3.0.6 <3.1.0",
           "resolved": "https://registry.npmjs.org/co/-/co-3.0.6.tgz",
           "dev": true
+        },
+        "ip": {
+          "version": "1.0.1",
+          "from": "ip@1.0.1",
+          "resolved": "https://registry.npmjs.org/ip/-/ip-1.0.1.tgz",
+          "dev": true
         }
       }
     },
@@ -9053,9 +9854,9 @@
       }
     },
     "pageres": {
-      "version": "4.5.0",
+      "version": "4.5.1",
       "from": "pageres@>=4.1.1 <5.0.0",
-      "resolved": "http://registry.npmjs.org/pageres/-/pageres-4.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/pageres/-/pageres-4.5.1.tgz",
       "dependencies": {
         "filename-reserved-regex": {
           "version": "2.0.0",
@@ -9299,6 +10100,11 @@
           "from": "fs-extra@>=1.0.0 <1.1.0",
           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz"
         },
+        "jsonfile": {
+          "version": "2.4.0",
+          "from": "jsonfile@>=2.1.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"
+        },
         "qs": {
           "version": "6.3.2",
           "from": "qs@>=6.3.0 <6.4.0",
@@ -9452,20 +10258,10 @@
       "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz"
     },
     "postcss-easy-import": {
-      "version": "2.0.0",
+      "version": "2.1.0",
       "from": "postcss-easy-import@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-easy-import/-/postcss-easy-import-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-easy-import/-/postcss-easy-import-2.1.0.tgz",
       "dependencies": {
-        "glob": {
-          "version": "7.1.1",
-          "from": "glob@>=7.0.3 <8.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"
-        },
-        "globby": {
-          "version": "6.1.0",
-          "from": "globby@>=6.1.0 <7.0.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"
-        },
         "is-extglob": {
           "version": "2.1.1",
           "from": "is-extglob@>=2.1.0 <3.0.0",
@@ -9544,48 +10340,132 @@
       "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz"
     },
     "postcss-modules-extract-imports": {
-      "version": "1.0.1",
+      "version": "1.1.0",
       "from": "postcss-modules-extract-imports@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.0.1.tgz"
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz",
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.0",
+          "from": "ansi-styles@>=3.1.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz"
+        },
+        "chalk": {
+          "version": "2.0.1",
+          "from": "chalk@>=2.0.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz"
+        },
+        "has-flag": {
+          "version": "2.0.0",
+          "from": "has-flag@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"
+        },
+        "postcss": {
+          "version": "6.0.8",
+          "from": "postcss@>=6.0.1 <7.0.0",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.8.tgz"
+        },
+        "supports-color": {
+          "version": "4.2.1",
+          "from": "supports-color@>=4.2.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz"
+        }
+      }
     },
     "postcss-modules-local-by-default": {
-      "version": "1.1.1",
+      "version": "1.2.0",
       "from": "postcss-modules-local-by-default@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz",
       "dependencies": {
-        "css-selector-tokenizer": {
-          "version": "0.6.0",
-          "from": "css-selector-tokenizer@>=0.6.0 <0.7.0",
-          "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.6.0.tgz"
+        "ansi-styles": {
+          "version": "3.2.0",
+          "from": "ansi-styles@>=3.1.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz"
         },
-        "regexpu-core": {
-          "version": "1.0.0",
-          "from": "regexpu-core@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz"
+        "chalk": {
+          "version": "2.0.1",
+          "from": "chalk@>=2.0.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz"
+        },
+        "has-flag": {
+          "version": "2.0.0",
+          "from": "has-flag@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"
+        },
+        "postcss": {
+          "version": "6.0.8",
+          "from": "postcss@>=6.0.1 <7.0.0",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.8.tgz"
+        },
+        "supports-color": {
+          "version": "4.2.1",
+          "from": "supports-color@>=4.2.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz"
         }
       }
     },
     "postcss-modules-scope": {
-      "version": "1.0.2",
+      "version": "1.1.0",
       "from": "postcss-modules-scope@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz",
       "dependencies": {
-        "css-selector-tokenizer": {
-          "version": "0.6.0",
-          "from": "css-selector-tokenizer@>=0.6.0 <0.7.0",
-          "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.6.0.tgz"
+        "ansi-styles": {
+          "version": "3.2.0",
+          "from": "ansi-styles@>=3.1.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz"
         },
-        "regexpu-core": {
-          "version": "1.0.0",
-          "from": "regexpu-core@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz"
+        "chalk": {
+          "version": "2.0.1",
+          "from": "chalk@>=2.0.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz"
+        },
+        "has-flag": {
+          "version": "2.0.0",
+          "from": "has-flag@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"
+        },
+        "postcss": {
+          "version": "6.0.8",
+          "from": "postcss@>=6.0.1 <7.0.0",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.8.tgz"
+        },
+        "supports-color": {
+          "version": "4.2.1",
+          "from": "supports-color@>=4.2.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz"
         }
       }
     },
     "postcss-modules-values": {
-      "version": "1.2.2",
+      "version": "1.3.0",
       "from": "postcss-modules-values@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.2.2.tgz"
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz",
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.0",
+          "from": "ansi-styles@>=3.1.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz"
+        },
+        "chalk": {
+          "version": "2.0.1",
+          "from": "chalk@>=2.0.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz"
+        },
+        "has-flag": {
+          "version": "2.0.0",
+          "from": "has-flag@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"
+        },
+        "postcss": {
+          "version": "6.0.8",
+          "from": "postcss@>=6.0.1 <7.0.0",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.8.tgz"
+        },
+        "supports-color": {
+          "version": "4.2.1",
+          "from": "supports-color@>=4.2.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz"
+        }
+      }
     },
     "postcss-normalize-charset": {
       "version": "1.1.1",
@@ -9669,9 +10549,9 @@
       "resolved": "https://registry.npmjs.org/pretty-data/-/pretty-data-0.40.0.tgz"
     },
     "pretty-error": {
-      "version": "2.1.0",
+      "version": "2.1.1",
       "from": "pretty-error@>=2.0.2 <3.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.0.tgz"
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz"
     },
     "pretty-hrtime": {
       "version": "1.0.3",
@@ -9774,9 +10654,9 @@
       }
     },
     "proxy-addr": {
-      "version": "1.1.4",
+      "version": "1.1.5",
       "from": "proxy-addr@>=1.1.3 <1.2.0",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tgz"
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz"
     },
     "proxy-agent": {
       "version": "2.0.0",
@@ -9804,7 +10684,7 @@
     },
     "pseudomap": {
       "version": "1.0.2",
-      "from": "pseudomap@>=1.0.1 <2.0.0",
+      "from": "pseudomap@>=1.0.2 <2.0.0",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"
     },
     "public-encrypt": {
@@ -9813,9 +10693,9 @@
       "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz"
     },
     "pug": {
-      "version": "2.0.0-rc.1",
+      "version": "2.0.0-rc.2",
       "from": "pug@>=2.0.0-beta.12 <3.0.0",
-      "resolved": "https://registry.npmjs.org/pug/-/pug-2.0.0-rc.1.tgz"
+      "resolved": "https://registry.npmjs.org/pug/-/pug-2.0.0-rc.2.tgz"
     },
     "pug-attrs": {
       "version": "2.0.2",
@@ -9838,9 +10718,9 @@
           "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz",
           "dependencies": {
             "acorn": {
-              "version": "4.0.11",
+              "version": "4.0.13",
               "from": "acorn@^4.0.4",
-              "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz"
+              "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz"
             }
           }
         },
@@ -9857,19 +10737,19 @@
       "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-1.3.2.tgz"
     },
     "pug-filters": {
-      "version": "2.1.2",
-      "from": "pug-filters@>=2.1.2 <3.0.0",
-      "resolved": "https://registry.npmjs.org/pug-filters/-/pug-filters-2.1.2.tgz",
+      "version": "2.1.3",
+      "from": "pug-filters@>=2.1.3 <3.0.0",
+      "resolved": "https://registry.npmjs.org/pug-filters/-/pug-filters-2.1.3.tgz",
       "dependencies": {
         "asap": {
-          "version": "2.0.5",
+          "version": "2.0.6",
           "from": "asap@>=2.0.3 <2.1.0",
-          "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz"
+          "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"
         },
         "clean-css": {
-          "version": "3.4.26",
+          "version": "3.4.28",
           "from": "clean-css@>=3.3.0 <4.0.0",
-          "resolved": "http://registry.npmjs.org/clean-css/-/clean-css-3.4.26.tgz"
+          "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz"
         },
         "commander": {
           "version": "2.8.1",
@@ -9882,9 +10762,9 @@
           "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz"
         },
         "promise": {
-          "version": "7.1.1",
+          "version": "7.3.1",
           "from": "promise@>=7.0.1 <8.0.0",
-          "resolved": "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz"
+          "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz"
         },
         "source-map": {
           "version": "0.4.4",
@@ -9892,9 +10772,9 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
         },
         "uglify-js": {
-          "version": "2.8.26",
+          "version": "2.8.29",
           "from": "uglify-js@>=2.6.1 <3.0.0",
-          "resolved": "http://registry.npmjs.org/uglify-js/-/uglify-js-2.8.26.tgz",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
           "dependencies": {
             "source-map": {
               "version": "0.5.6",
@@ -9918,19 +10798,19 @@
       }
     },
     "pug-linker": {
-      "version": "3.0.0",
-      "from": "pug-linker@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.0.tgz"
+      "version": "3.0.1",
+      "from": "pug-linker@>=3.0.1 <4.0.0",
+      "resolved": "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.1.tgz"
     },
     "pug-load": {
-      "version": "2.0.6",
-      "from": "pug-load@>=2.0.6 <3.0.0",
-      "resolved": "https://registry.npmjs.org/pug-load/-/pug-load-2.0.6.tgz"
+      "version": "2.0.7",
+      "from": "pug-load@>=2.0.7 <3.0.0",
+      "resolved": "https://registry.npmjs.org/pug-load/-/pug-load-2.0.7.tgz"
     },
     "pug-parser": {
-      "version": "2.0.2",
-      "from": "pug-parser@>=2.0.2 <3.0.0",
-      "resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-2.0.2.tgz"
+      "version": "3.0.0",
+      "from": "pug-parser@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-3.0.0.tgz"
     },
     "pug-runtime": {
       "version": "2.0.3",
@@ -9943,9 +10823,9 @@
       "resolved": "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.2.tgz"
     },
     "pug-walk": {
-      "version": "1.1.2",
-      "from": "pug-walk@>=1.1.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.2.tgz"
+      "version": "1.1.3",
+      "from": "pug-walk@>=1.1.3 <2.0.0",
+      "resolved": "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.3.tgz"
     },
     "pump": {
       "version": "0.3.5",
@@ -10038,20 +10918,39 @@
       }
     },
     "ramda": {
-      "version": "0.23.0",
-      "from": "ramda@>=0.23.0 <0.24.0",
-      "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.23.0.tgz",
+      "version": "0.24.1",
+      "from": "ramda@>=0.24.1 <0.25.0",
+      "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.24.1.tgz",
       "dev": true
     },
     "randomatic": {
-      "version": "1.1.6",
+      "version": "1.1.7",
       "from": "randomatic@>=1.1.3 <2.0.0",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz"
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
+      "dependencies": {
+        "is-number": {
+          "version": "3.0.0",
+          "from": "is-number@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "from": "kind-of@^3.0.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"
+            }
+          }
+        },
+        "kind-of": {
+          "version": "4.0.0",
+          "from": "kind-of@>=4.0.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"
+        }
+      }
     },
     "randombytes": {
-      "version": "2.0.3",
+      "version": "2.0.5",
       "from": "randombytes@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.3.tgz"
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz"
     },
     "range-parser": {
       "version": "1.2.0",
@@ -10070,6 +10969,12 @@
         }
       }
     },
+    "raw-loader": {
+      "version": "0.5.1",
+      "from": "raw-loader@>=0.5.1 <0.6.0",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
+      "dev": true
+    },
     "rc": {
       "version": "1.1.7",
       "from": "rc@>=1.1.6 <1.2.0",
@@ -10139,26 +11044,6 @@
         }
       }
     },
-    "recast": {
-      "version": "0.10.33",
-      "from": "recast@0.10.33",
-      "resolved": "https://registry.npmjs.org/recast/-/recast-0.10.33.tgz",
-      "dev": true,
-      "dependencies": {
-        "ast-types": {
-          "version": "0.8.12",
-          "from": "ast-types@0.8.12",
-          "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.8.12.tgz",
-          "dev": true
-        },
-        "esprima-fb": {
-          "version": "15001.1001.0-dev-harmony-fb",
-          "from": "esprima-fb@~15001.1001.0-dev-harmony-fb",
-          "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz",
-          "dev": true
-        }
-      }
-    },
     "rechoir": {
       "version": "0.6.2",
       "from": "rechoir@>=0.6.2 <0.7.0",
@@ -10177,38 +11062,32 @@
     "reduce-css-calc": {
       "version": "1.3.0",
       "from": "reduce-css-calc@>=1.2.6 <2.0.0",
-      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz"
+      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
+      "dependencies": {
+        "balanced-match": {
+          "version": "0.4.2",
+          "from": "balanced-match@>=0.4.2 <0.5.0",
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
+        }
+      }
     },
     "reduce-function-call": {
       "version": "1.0.2",
       "from": "reduce-function-call@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz"
+      "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz",
+      "dependencies": {
+        "balanced-match": {
+          "version": "0.4.2",
+          "from": "balanced-match@>=0.4.2 <0.5.0",
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
+        }
+      }
     },
     "regenerate": {
       "version": "1.3.2",
       "from": "regenerate@>=1.2.1 <2.0.0",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz"
     },
-    "regenerator": {
-      "version": "0.8.46",
-      "from": "regenerator@>=0.8.13 <0.9.0",
-      "resolved": "https://registry.npmjs.org/regenerator/-/regenerator-0.8.46.tgz",
-      "dev": true,
-      "dependencies": {
-        "esprima-fb": {
-          "version": "15001.1001.0-dev-harmony-fb",
-          "from": "esprima-fb@>=15001.1001.0-dev-harmony-fb <15001.1002.0",
-          "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz",
-          "dev": true
-        },
-        "regenerator-runtime": {
-          "version": "0.9.6",
-          "from": "regenerator-runtime@>=0.9.5 <0.10.0",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz",
-          "dev": true
-        }
-      }
-    },
     "regenerator-runtime": {
       "version": "0.10.5",
       "from": "regenerator-runtime@>=0.10.0 <0.11.0",
@@ -10262,9 +11141,9 @@
       "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz"
     },
     "remove-trailing-separator": {
-      "version": "1.0.1",
+      "version": "1.0.2",
       "from": "remove-trailing-separator@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz"
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz"
     },
     "renderkid": {
       "version": "2.0.1",
@@ -10328,14 +11207,14 @@
       }
     },
     "require_optional": {
-      "version": "1.0.0",
+      "version": "1.0.1",
       "from": "require_optional@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz",
       "dependencies": {
         "semver": {
-          "version": "5.3.0",
+          "version": "5.4.1",
           "from": "semver@>=5.1.0 <6.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"
         }
       }
     },
@@ -10381,9 +11260,9 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.3.3",
+      "version": "1.4.0",
       "from": "resolve@>=1.1.4 <2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz"
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz"
     },
     "resolve-dir": {
       "version": "0.1.1",
@@ -10434,9 +11313,9 @@
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
       "dependencies": {
         "glob": {
-          "version": "7.1.1",
+          "version": "7.1.2",
           "from": "glob@>=7.0.5 <8.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"
         }
       }
     },
@@ -10473,9 +11352,9 @@
       "resolved": "https://registry.npmjs.org/s3-upload-stream/-/s3-upload-stream-1.0.7.tgz"
     },
     "safe-buffer": {
-      "version": "5.0.1",
+      "version": "5.1.1",
       "from": "safe-buffer@>=5.0.1 <6.0.0",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
     },
     "samsam": {
       "version": "1.1.2",
@@ -10499,9 +11378,9 @@
           "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"
         },
         "glob": {
-          "version": "7.1.1",
+          "version": "7.1.2",
           "from": "glob@>=7.0.0 <8.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"
         },
         "yargs": {
           "version": "7.1.0",
@@ -10511,19 +11390,24 @@
       }
     },
     "sass-loader": {
-      "version": "6.0.5",
+      "version": "6.0.6",
       "from": "sass-loader@>=6.0.2 <7.0.0",
-      "resolved": "http://registry.npmjs.org/sass-loader/-/sass-loader-6.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.6.tgz",
       "dependencies": {
         "async": {
-          "version": "2.4.0",
+          "version": "2.5.0",
           "from": "async@>=2.1.5 <3.0.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.4.0.tgz"
+          "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz"
         },
         "loader-utils": {
           "version": "1.1.0",
           "from": "loader-utils@>=1.0.1 <2.0.0",
           "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz"
+        },
+        "pify": {
+          "version": "3.0.0",
+          "from": "pify@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"
         }
       }
     },
@@ -10550,10 +11434,22 @@
       "from": "sax@>=0.6.0 <0.7.0",
       "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
     },
+    "schema-utils": {
+      "version": "0.3.0",
+      "from": "schema-utils@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
+      "dependencies": {
+        "ajv": {
+          "version": "5.2.2",
+          "from": "ajv@>=5.0.0 <6.0.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz"
+        }
+      }
+    },
     "screenshot-stream": {
-      "version": "4.1.0",
+      "version": "4.2.0",
       "from": "screenshot-stream@>=4.1.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/screenshot-stream/-/screenshot-stream-4.1.0.tgz"
+      "resolved": "https://registry.npmjs.org/screenshot-stream/-/screenshot-stream-4.2.0.tgz"
     },
     "scss-tokenizer": {
       "version": "0.2.3",
@@ -10646,9 +11542,9 @@
       "optional": true,
       "dependencies": {
         "semver": {
-          "version": "5.3.0",
+          "version": "5.4.1",
           "from": "semver@>=5.3.0 <6.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
           "optional": true
         }
       }
@@ -10711,6 +11607,11 @@
           "version": "0.5.0",
           "from": "fresh@0.5.0",
           "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz"
+        },
+        "safe-buffer": {
+          "version": "5.0.1",
+          "from": "safe-buffer@5.0.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"
         }
       }
     },
@@ -10796,14 +11697,14 @@
       "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.4.3.tgz"
     },
     "shelljs": {
-      "version": "0.7.7",
+      "version": "0.7.8",
       "from": "shelljs@>=0.7.6 <0.8.0",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz",
       "dependencies": {
         "glob": {
-          "version": "7.1.1",
+          "version": "7.1.2",
           "from": "glob@>=7.0.0 <8.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"
         }
       }
     },
@@ -10817,23 +11718,11 @@
       "from": "signal-exit@>=3.0.0 <4.0.0",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"
     },
-    "simple-fmt": {
-      "version": "0.1.0",
-      "from": "simple-fmt@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/simple-fmt/-/simple-fmt-0.1.0.tgz",
-      "dev": true
-    },
     "simple-html-tokenizer": {
       "version": "0.1.1",
       "from": "simple-html-tokenizer@>=0.1.1 <0.2.0",
       "resolved": "https://registry.npmjs.org/simple-html-tokenizer/-/simple-html-tokenizer-0.1.1.tgz"
     },
-    "simple-is": {
-      "version": "0.2.0",
-      "from": "simple-is@>=0.2.0 <0.3.0",
-      "resolved": "https://registry.npmjs.org/simple-is/-/simple-is-0.2.0.tgz",
-      "dev": true
-    },
     "sinon": {
       "version": "1.17.7",
       "from": "sinon@>=1.17.2 <2.0.0",
@@ -10849,9 +11738,9 @@
       }
     },
     "sinon-chai": {
-      "version": "2.10.0",
+      "version": "2.12.0",
       "from": "sinon-chai@>=2.8.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/sinon-chai/-/sinon-chai-2.10.0.tgz",
+      "resolved": "https://registry.npmjs.org/sinon-chai/-/sinon-chai-2.12.0.tgz",
       "dev": true
     },
     "sinon-stub-promise": {
@@ -11000,9 +11889,9 @@
       "resolved": "https://registry.npmjs.org/socks/-/socks-1.1.9.tgz"
     },
     "socks-proxy-agent": {
-      "version": "2.0.0",
+      "version": "2.1.1",
       "from": "socks-proxy-agent@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz",
       "dev": true
     },
     "sort-keys": {
@@ -11131,9 +12020,9 @@
       "optional": true
     },
     "sshpk": {
-      "version": "1.13.0",
+      "version": "1.13.1",
       "from": "sshpk@>=1.7.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
       "dependencies": {
         "assert-plus": {
           "version": "1.0.0",
@@ -11142,12 +12031,6 @@
         }
       }
     },
-    "stable": {
-      "version": "0.1.6",
-      "from": "stable@>=0.1.3 <0.2.0",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.6.tgz",
-      "dev": true
-    },
     "stack-trace": {
       "version": "0.0.10",
       "from": "stack-trace@>=0.0.0 <0.1.0",
@@ -11176,9 +12059,9 @@
       }
     },
     "static-module": {
-      "version": "1.3.2",
+      "version": "1.5.0",
       "from": "static-module@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/static-module/-/static-module-1.3.2.tgz",
+      "resolved": "https://registry.npmjs.org/static-module/-/static-module-1.5.0.tgz",
       "dependencies": {
         "concat-stream": {
           "version": "1.6.0",
@@ -11186,9 +12069,9 @@
           "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
           "dependencies": {
             "readable-stream": {
-              "version": "2.2.9",
+              "version": "2.3.3",
               "from": "readable-stream@>=2.2.2 <3.0.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz"
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"
             }
           }
         },
@@ -11237,9 +12120,9 @@
           }
         },
         "string_decoder": {
-          "version": "1.0.0",
-          "from": "string_decoder@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.0.tgz"
+          "version": "1.0.3",
+          "from": "string_decoder@>=1.0.3 <1.1.0",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"
         },
         "through2": {
           "version": "0.4.2",
@@ -11284,19 +12167,19 @@
       "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
     },
     "stream-http": {
-      "version": "2.7.1",
+      "version": "2.7.2",
       "from": "stream-http@>=2.0.0 <3.0.0",
-      "resolved": "http://registry.npmjs.org/stream-http/-/stream-http-2.7.1.tgz",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz",
       "dependencies": {
         "readable-stream": {
-          "version": "2.2.9",
+          "version": "2.3.3",
           "from": "readable-stream@>=2.2.6 <3.0.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz"
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"
         },
         "string_decoder": {
-          "version": "1.0.0",
-          "from": "string_decoder@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.0.tgz"
+          "version": "1.0.3",
+          "from": "string_decoder@>=1.0.3 <1.1.0",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"
         }
       }
     },
@@ -11310,18 +12193,6 @@
       "from": "stream-splicer@>=2.0.0 <3.0.0",
       "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz"
     },
-    "stream-to": {
-      "version": "0.2.2",
-      "from": "stream-to@>=0.2.0 <0.3.0",
-      "resolved": "https://registry.npmjs.org/stream-to/-/stream-to-0.2.2.tgz",
-      "dev": true
-    },
-    "stream-to-buffer": {
-      "version": "0.1.0",
-      "from": "stream-to-buffer@0.1.0",
-      "resolved": "https://registry.npmjs.org/stream-to-buffer/-/stream-to-buffer-0.1.0.tgz",
-      "dev": true
-    },
     "strict-uri-encode": {
       "version": "1.1.0",
       "from": "strict-uri-encode@>=1.0.0 <2.0.0",
@@ -11359,18 +12230,6 @@
       "from": "stringify-object@>=1.0.0 <1.1.0",
       "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-1.0.1.tgz"
     },
-    "stringmap": {
-      "version": "0.2.2",
-      "from": "stringmap@>=0.2.2 <0.3.0",
-      "resolved": "https://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz",
-      "dev": true
-    },
-    "stringset": {
-      "version": "0.2.1",
-      "from": "stringset@>=0.2.1 <0.3.0",
-      "resolved": "https://registry.npmjs.org/stringset/-/stringset-0.2.1.tgz",
-      "dev": true
-    },
     "stringstream": {
       "version": "0.0.5",
       "from": "stringstream@>=0.0.4 <0.1.0",
@@ -11434,9 +12293,9 @@
       "resolved": "https://registry.npmjs.org/strip-url-auth/-/strip-url-auth-1.0.1.tgz"
     },
     "stripe": {
-      "version": "4.19.0",
+      "version": "4.23.1",
       "from": "stripe@>=4.2.0 <5.0.0",
-      "resolved": "http://registry.npmjs.org/stripe/-/stripe-4.19.0.tgz",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-4.23.1.tgz",
       "dependencies": {
         "bluebird": {
           "version": "2.11.0",
@@ -11505,9 +12364,9 @@
       "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.5.2.tgz",
       "dependencies": {
         "form-data": {
-          "version": "2.1.4",
+          "version": "2.2.0",
           "from": "form-data@>=2.1.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.2.0.tgz"
         },
         "mime": {
           "version": "1.3.6",
@@ -11529,23 +12388,23 @@
     },
     "svg-inline-loader": {
       "version": "0.7.1",
-      "from": "svg-inline-loader@latest",
+      "from": "svg-inline-loader@>=0.7.1 <0.8.0",
       "resolved": "https://registry.npmjs.org/svg-inline-loader/-/svg-inline-loader-0.7.1.tgz"
     },
     "svg-url-loader": {
-      "version": "2.0.2",
-      "from": "svg-url-loader@latest",
-      "resolved": "https://registry.npmjs.org/svg-url-loader/-/svg-url-loader-2.0.2.tgz",
+      "version": "2.1.1",
+      "from": "svg-url-loader@>=2.0.2 <3.0.0",
+      "resolved": "https://registry.npmjs.org/svg-url-loader/-/svg-url-loader-2.1.1.tgz",
       "dependencies": {
         "file-loader": {
-          "version": "0.10.0",
-          "from": "file-loader@0.10.0",
-          "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.10.0.tgz"
+          "version": "0.11.2",
+          "from": "file-loader@0.11.2",
+          "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.2.tgz"
         },
         "loader-utils": {
-          "version": "0.2.16",
-          "from": "loader-utils@0.2.16",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.16.tgz"
+          "version": "1.1.0",
+          "from": "loader-utils@1.1.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz"
         }
       }
     },
@@ -11570,15 +12429,15 @@
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"
         },
         "sax": {
-          "version": "1.2.2",
+          "version": "1.2.4",
           "from": "sax@>=1.2.1 <1.3.0",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz"
+          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"
         }
       }
     },
     "svgo-loader": {
       "version": "1.2.1",
-      "from": "svgo-loader@latest",
+      "from": "svgo-loader@>=1.2.1 <2.0.0",
       "resolved": "https://registry.npmjs.org/svgo-loader/-/svgo-loader-1.2.1.tgz",
       "dependencies": {
         "loader-utils": {
@@ -11599,6 +12458,12 @@
       "resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz",
       "dev": true,
       "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "from": "ansi-regex@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "dev": true
+        },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
           "from": "is-fullwidth-code-point@>=2.0.0 <3.0.0",
@@ -11606,17 +12471,23 @@
           "dev": true
         },
         "string-width": {
-          "version": "2.0.0",
+          "version": "2.1.1",
           "from": "string-width@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "from": "strip-ansi@>=4.0.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
           "dev": true
         }
       }
     },
     "tapable": {
-      "version": "0.2.6",
+      "version": "0.2.7",
       "from": "tapable@>=0.2.5 <0.3.0",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz"
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.7.tgz"
     },
     "tar": {
       "version": "2.2.1",
@@ -11639,9 +12510,9 @@
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
         },
         "glob": {
-          "version": "7.1.1",
+          "version": "7.1.2",
           "from": "glob@>=7.0.5 <8.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"
         },
         "ms": {
           "version": "0.7.1",
@@ -11707,9 +12578,9 @@
       }
     },
     "test-exclude": {
-      "version": "4.1.0",
-      "from": "test-exclude@>=4.1.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.1.0.tgz",
+      "version": "4.1.1",
+      "from": "test-exclude@>=4.1.1 <5.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.1.1.tgz",
       "dev": true
     },
     "tether": {
@@ -11739,14 +12610,14 @@
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
       "dependencies": {
         "readable-stream": {
-          "version": "2.2.9",
+          "version": "2.3.3",
           "from": "readable-stream@>=2.1.5 <3.0.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz"
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"
         },
         "string_decoder": {
-          "version": "1.0.0",
-          "from": "string_decoder@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.0.tgz"
+          "version": "1.0.3",
+          "from": "string_decoder@>=1.0.3 <1.1.0",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"
         }
       }
     },
@@ -11941,12 +12812,6 @@
       "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
       "dev": true
     },
-    "tryor": {
-      "version": "0.1.2",
-      "from": "tryor@>=0.1.2 <0.2.0",
-      "resolved": "https://registry.npmjs.org/tryor/-/tryor-0.1.2.tgz",
-      "dev": true
-    },
     "tty-browserify": {
       "version": "0.0.0",
       "from": "tty-browserify@>=0.0.0 <0.1.0",
@@ -11977,7 +12842,7 @@
     },
     "type-is": {
       "version": "1.6.15",
-      "from": "type-is@>=1.6.14 <1.7.0",
+      "from": "type-is@>=1.6.15 <1.7.0",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz"
     },
     "typedarray": {
@@ -12089,15 +12954,20 @@
         }
       }
     },
+    "universalify": {
+      "version": "0.1.1",
+      "from": "universalify@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz"
+    },
     "unpipe": {
       "version": "1.0.0",
       "from": "unpipe@1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
     },
     "unused-filename": {
-      "version": "0.1.0",
-      "from": "unused-filename@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/unused-filename/-/unused-filename-0.1.0.tgz",
+      "version": "1.0.0",
+      "from": "unused-filename@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/unused-filename/-/unused-filename-1.0.0.tgz",
       "dependencies": {
         "path-exists": {
           "version": "3.0.0",
@@ -12181,9 +13051,9 @@
       "resolved": "https://registry.npmjs.org/url-join/-/url-join-0.0.1.tgz"
     },
     "url-loader": {
-      "version": "0.5.8",
+      "version": "0.5.9",
       "from": "url-loader@>=0.5.7 <0.6.0",
-      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.8.tgz",
+      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.9.tgz",
       "dependencies": {
         "loader-utils": {
           "version": "1.1.0",
@@ -12231,9 +13101,9 @@
       "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
     },
     "useragent": {
-      "version": "2.1.13",
+      "version": "2.2.1",
       "from": "useragent@>=2.1.9 <3.0.0",
-      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.1.13.tgz",
+      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz",
       "dependencies": {
         "lru-cache": {
           "version": "2.2.4",
@@ -12270,9 +13140,9 @@
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
     },
     "uuid": {
-      "version": "3.0.1",
+      "version": "3.1.0",
       "from": "uuid@>=3.0.1 <4.0.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz"
     },
     "v8flags": {
       "version": "2.1.1",
@@ -12292,11 +13162,18 @@
     "validator": {
       "version": "4.9.0",
       "from": "validator@>=4.9.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-4.9.0.tgz"
+      "resolved": "https://registry.npmjs.org/validator/-/validator-4.9.0.tgz",
+      "dependencies": {
+        "depd": {
+          "version": "1.1.0",
+          "from": "depd@1.1.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz"
+        }
+      }
     },
     "vary": {
       "version": "1.1.1",
-      "from": "vary@>=1.1.0 <1.2.0",
+      "from": "vary@>=1.1.1 <1.2.0",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz"
     },
     "vendors": {
@@ -12485,9 +13362,9 @@
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz"
     },
     "vue": {
-      "version": "2.3.3",
+      "version": "2.4.2",
       "from": "vue@>=2.1.0 <3.0.0",
-      "resolved": "http://registry.npmjs.org/vue/-/vue-2.3.3.tgz"
+      "resolved": "https://registry.npmjs.org/vue/-/vue-2.4.2.tgz"
     },
     "vue-hot-reload-api": {
       "version": "2.1.0",
@@ -12505,9 +13382,9 @@
           "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz"
         },
         "lru-cache": {
-          "version": "4.0.2",
+          "version": "4.1.1",
           "from": "lru-cache@>=4.0.1 <5.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz"
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz"
         },
         "vue-style-loader": {
           "version": "2.0.5",
@@ -12517,9 +13394,9 @@
       }
     },
     "vue-mugen-scroll": {
-      "version": "0.2.4",
+      "version": "0.2.5",
       "from": "vue-mugen-scroll@>=0.2.1 <0.3.0",
-      "resolved": "http://registry.npmjs.org/vue-mugen-scroll/-/vue-mugen-scroll-0.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/vue-mugen-scroll/-/vue-mugen-scroll-0.2.5.tgz",
       "dependencies": {
         "throttleit": {
           "version": "1.0.0",
@@ -12529,9 +13406,9 @@
       }
     },
     "vue-router": {
-      "version": "2.5.3",
+      "version": "2.7.0",
       "from": "vue-router@>=2.0.0-rc.5 <3.0.0",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-2.5.3.tgz"
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-2.7.0.tgz"
     },
     "vue-style-loader": {
       "version": "3.0.1",
@@ -12546,14 +13423,19 @@
       }
     },
     "vue-template-compiler": {
-      "version": "2.3.3",
+      "version": "2.4.2",
       "from": "vue-template-compiler@>=2.1.10 <3.0.0",
-      "resolved": "http://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.3.3.tgz"
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.4.2.tgz"
     },
     "vue-template-es2015-compiler": {
-      "version": "1.5.2",
+      "version": "1.5.3",
       "from": "vue-template-es2015-compiler@>=1.2.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.2.tgz"
+      "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.3.tgz"
+    },
+    "vuejs-datepicker": {
+      "version": "0.9.4",
+      "from": "vuejs-datepicker@>=0.9.4 <0.10.0",
+      "resolved": "https://registry.npmjs.org/vuejs-datepicker/-/vuejs-datepicker-0.9.4.tgz"
     },
     "w3counter": {
       "version": "3.0.1",
@@ -12566,36 +13448,31 @@
       "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz"
     },
     "watchpack": {
-      "version": "1.3.1",
+      "version": "1.4.0",
       "from": "watchpack@>=1.3.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz",
       "dependencies": {
         "async": {
-          "version": "2.4.1",
-          "from": "async@^2.1.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.4.1.tgz"
+          "version": "2.5.0",
+          "from": "async@>=2.1.2 <3.0.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz"
         }
       }
     },
     "webpack": {
-      "version": "2.6.1",
-      "from": "webpack@2.6.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-2.6.1.tgz",
+      "version": "2.7.0",
+      "from": "webpack@>=2.2.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-2.7.0.tgz",
       "dependencies": {
         "acorn": {
-          "version": "5.0.3",
+          "version": "5.1.1",
           "from": "acorn@>=5.0.0 <6.0.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz"
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz"
         },
         "async": {
-          "version": "2.4.1",
+          "version": "2.5.0",
           "from": "async@>=2.1.2 <3.0.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.4.1.tgz"
-        },
-        "source-list-map": {
-          "version": "1.1.2",
-          "from": "source-list-map@>=1.1.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz"
+          "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz"
         },
         "supports-color": {
           "version": "3.2.3",
@@ -12603,9 +13480,9 @@
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz"
         },
         "uglify-js": {
-          "version": "2.8.28",
+          "version": "2.8.29",
           "from": "uglify-js@>=2.8.27 <3.0.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.28.tgz",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
           "dependencies": {
             "yargs": {
               "version": "3.10.0",
@@ -12614,11 +13491,6 @@
             }
           }
         },
-        "webpack-sources": {
-          "version": "0.2.3",
-          "from": "webpack-sources@>=0.2.3 <0.3.0",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz"
-        },
         "yargs": {
           "version": "6.6.0",
           "from": "yargs@>=6.0.0 <7.0.0",
@@ -12651,21 +13523,27 @@
       }
     },
     "webpack-bundle-analyzer": {
-      "version": "2.8.1",
+      "version": "2.8.3",
       "from": "webpack-bundle-analyzer@>=2.2.1 <3.0.0",
-      "resolved": "http://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.8.1.tgz",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.8.3.tgz",
       "dev": true,
       "dependencies": {
         "acorn": {
-          "version": "5.0.3",
-          "from": "acorn@>=5.0.3 <6.0.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz",
+          "version": "5.1.1",
+          "from": "acorn@>=5.1.1 <6.0.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.6.7",
+          "from": "debug@2.6.7",
+          "resolved": "http://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
           "dev": true
         },
         "ejs": {
-          "version": "2.5.6",
+          "version": "2.5.7",
           "from": "ejs@>=2.5.6 <3.0.0",
-          "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.6.tgz",
+          "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz",
           "dev": true
         },
         "etag": {
@@ -12710,6 +13588,12 @@
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
           "dev": true
         },
+        "safe-buffer": {
+          "version": "5.0.1",
+          "from": "safe-buffer@>=5.0.1 <5.1.0",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
+          "dev": true
+        },
         "send": {
           "version": "0.15.3",
           "from": "send@0.15.3",
@@ -12737,9 +13621,9 @@
       }
     },
     "webpack-dev-middleware": {
-      "version": "1.10.2",
+      "version": "1.12.0",
       "from": "webpack-dev-middleware@>=1.10.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.10.2.tgz",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz",
       "dev": true,
       "dependencies": {
         "mime": {
@@ -12747,13 +13631,19 @@
           "from": "mime@>=1.3.4 <2.0.0",
           "resolved": "http://registry.npmjs.org/mime/-/mime-1.3.6.tgz",
           "dev": true
+        },
+        "time-stamp": {
+          "version": "2.0.0",
+          "from": "time-stamp@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-2.0.0.tgz",
+          "dev": true
         }
       }
     },
     "webpack-hot-middleware": {
-      "version": "2.18.0",
+      "version": "2.18.2",
       "from": "webpack-hot-middleware@>=2.6.1 <3.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.18.2.tgz",
       "dev": true
     },
     "webpack-merge": {
@@ -12762,9 +13652,16 @@
       "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.0.tgz"
     },
     "webpack-sources": {
-      "version": "0.1.5",
-      "from": "webpack-sources@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.5.tgz"
+      "version": "1.0.1",
+      "from": "webpack-sources@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz",
+      "dependencies": {
+        "source-list-map": {
+          "version": "2.0.0",
+          "from": "source-list-map@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz"
+        }
+      }
     },
     "whet.extend": {
       "version": "0.9.9",
@@ -12912,9 +13809,9 @@
       }
     },
     "xmlbuilder": {
-      "version": "9.0.0",
+      "version": "9.0.1",
       "from": "xmlbuilder@>=1.0.0",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.0.tgz"
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.1.tgz"
     },
     "xmldom": {
       "version": "0.1.19",
@@ -12950,7 +13847,7 @@
     },
     "yallist": {
       "version": "2.1.2",
-      "from": "yallist@>=2.0.0 <3.0.0",
+      "from": "yallist@>=2.1.2 <3.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"
     },
     "yargs": {
diff --git a/package.json b/package.json
index 7e06c51726..42e5fdbd6f 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "coupon-code": "^0.4.5",
     "css-loader": "^0.28.0",
     "csv-stringify": "^1.0.2",
-    "cwait": "^1.0.0",
+    "cwait": "~1.0.1",
     "domain-middleware": "~0.1.0",
     "estraverse": "^4.1.1",
     "express": "~4.14.0",
@@ -81,7 +81,7 @@
     "method-override": "^2.3.5",
     "moment": "^2.13.0",
     "moment-recur": "habitrpg/moment-recur#v1.0.6",
-    "mongoose": "^4.8.6",
+    "mongoose": "~4.8.6",
     "mongoose-id-autoinc": "~2013.7.14-4",
     "morgan": "^1.7.0",
     "nconf": "~0.8.2",
@@ -128,6 +128,7 @@
     "vue-router": "^2.0.0-rc.5",
     "vue-style-loader": "^3.0.0",
     "vue-template-compiler": "^2.1.10",
+    "vuejs-datepicker": "^0.9.4",
     "webpack": "^2.2.1",
     "webpack-merge": "^4.0.0",
     "winston": "^2.1.0",
diff --git a/website/client/assets/scss/task.scss b/website/client/assets/scss/task.scss
index d780f37df5..30387aa58a 100644
--- a/website/client/assets/scss/task.scss
+++ b/website/client/assets/scss/task.scss
@@ -2,6 +2,14 @@
   // for editing rewards or when a task is created
   &-purple {
     background: $purple-300;
+
+    &-control-habit {
+      background: $purple-300;
+    }
+
+    &-modal-input {
+      color: $header-color !important;
+    }
   }
 
   &-worst {
@@ -13,6 +21,10 @@
     &-control-daily-todo {
       background: $maroon-500;
     }
+
+    &-modal-input {
+      color: $maroon-500 !important;
+    }
   }
 
   &-worse {
@@ -24,6 +36,10 @@
     &-control-daily-todo {
       background: $red-500;
     }
+
+    &-modal-input {
+      color: $red-500 !important;
+    }
   }
 
   &-bad {
@@ -35,6 +51,10 @@
     &-control-daily-todo {
       background: $orange-500;
     }
+
+    &-modal-input {
+      color: $orange-500 !important;
+    }
   }
 
   &-neutral {
@@ -46,6 +66,10 @@
     &-control-daily-todo {
       background: $yellow-500;
     }
+
+    &-modal-input {
+      color: $yellow-500 !important;
+    }
   }
 
   &-good {
@@ -57,6 +81,10 @@
     &-control-daily-todo {
       background: $green-500;
     }
+
+    &-modal-input {
+      color: $green-500 !important;
+    }
   }
 
   &-better {
@@ -68,6 +96,10 @@
     &-control-daily-todo {
       background: $blue-500;
     }
+
+    &-modal-input {
+      color: $blue-500 !important;
+    }
   }
 
   &-best {
@@ -79,6 +111,10 @@
     &-control-daily-todo {
       background: $teal-500;
     }
+
+    &-modal-input {
+      color: $teal-500 !important;
+    }
   }
 
   &-reward {
@@ -111,4 +147,27 @@
       border: 1px solid rgba(0, 0, 0, 0.12);
     }
   }
+}
+
+.task-control {
+  width: 28px;
+  height: 28px;
+}
+
+.habit-control {
+  border-radius: 100px;
+  color: $white;
+
+  .svg-icon {
+    width: 10px;
+    margin: 0 auto;
+  }
+
+  .positive {
+    margin-top: 9px;
+  }
+
+  .negative {
+    margin-top: 13px;
+  }
 }
\ No newline at end of file
diff --git a/website/client/assets/svg/difficulty-hard.svg b/website/client/assets/svg/difficulty-hard.svg
new file mode 100644
index 0000000000..cba64829b2
--- /dev/null
+++ b/website/client/assets/svg/difficulty-hard.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 0 36 36">
+    <g fill-rule="evenodd">
+        <path d="M10.667 10.667L16 8l-5.333-2.667L8 0 5.333 5.333 0 8l5.333 2.667L8 16zM10.667 30.667L16 28l-5.333-2.667L8 20l-2.667 5.333L0 28l5.333 2.667L8 36zM30.667 10.667L36 8l-5.333-2.667L28 0l-2.667 5.333L20 8l5.333 2.667L28 16zM30.667 30.667L36 28l-5.333-2.667L28 20l-2.667 5.333L20 28l5.333 2.667L28 36z"/>
+    </g>
+</svg>
diff --git a/website/client/assets/svg/difficulty-medium.svg b/website/client/assets/svg/difficulty-medium.svg
new file mode 100644
index 0000000000..110dd9ade6
--- /dev/null
+++ b/website/client/assets/svg/difficulty-medium.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="36" height="32" viewBox="0 0 36 32">
+    <g fill-rule="evenodd">
+        <path d="M10.667 26.667L16 24l-5.333-2.667L8 16l-2.667 5.333L0 24l5.333 2.667L8 32zM30.667 26.667L36 24l-5.333-2.667L28 16l-2.667 5.333L20 24l5.333 2.667L28 32zM20.667 10.667L26 8l-5.333-2.667L18 0l-2.667 5.333L10 8l5.333 2.667L18 16z"/>
+    </g>
+</svg>
diff --git a/website/client/assets/svg/difficulty-normal.svg b/website/client/assets/svg/difficulty-normal.svg
new file mode 100644
index 0000000000..5d3fa18400
--- /dev/null
+++ b/website/client/assets/svg/difficulty-normal.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="36" height="16" viewBox="0 0 36 16">
+    <g fill-rule="evenodd">
+        <path d="M10.667 10.667L16 8l-5.333-2.667L8 0 5.333 5.333 0 8l5.333 2.667L8 16zM30.667 10.667L36 8l-5.333-2.667L28 0l-2.667 5.333L20 8l5.333 2.667L28 16z"/>
+    </g>
+</svg>
diff --git a/website/client/assets/svg/difficulty-trivial.svg b/website/client/assets/svg/difficulty-trivial.svg
new file mode 100644
index 0000000000..9cad150127
--- /dev/null
+++ b/website/client/assets/svg/difficulty-trivial.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+    <path fill-rule="evenodd" d="M10.667 10.667L16 8l-5.333-2.667L8 0 5.333 5.333 0 8l5.333 2.667L8 16z"/>
+</svg>
diff --git a/website/client/assets/svg/filter.svg b/website/client/assets/svg/filter.svg
index 558ff2f7cc..be38ccf5ae 100644
--- a/website/client/assets/svg/filter.svg
+++ b/website/client/assets/svg/filter.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="10" viewBox="0 0 12 10">
-    <path fill="#686274" fill-rule="evenodd" d="M0 0h12v2H0V0zm2 4h8v2H2V4zm2 4h4v2H4V8z"/>
+    <path fill-rule="evenodd" d="M0 0h12v2H0V0zm2 4h8v2H2V4zm2 4h4v2H4V8z"/>
 </svg>
diff --git a/website/client/assets/svg/for-css/positive.svg b/website/client/assets/svg/for-css/positive.svg
new file mode 100644
index 0000000000..85331f22a0
--- /dev/null
+++ b/website/client/assets/svg/for-css/positive.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 10 10">
+    <path fill="#24CC8F" fill-rule="evenodd" d="M6 4V0H4v4H0v2h4v4h2V6h4V4H6z"/>
+</svg>
diff --git a/website/client/components/groups/groupFormModal.vue b/website/client/components/groups/groupFormModal.vue
index 9b4e7b9d82..f45122b520 100644
--- a/website/client/components/groups/groupFormModal.vue
+++ b/website/client/components/groups/groupFormModal.vue
@@ -70,7 +70,7 @@
             :key="group.key",
           )
             label.custom-control.custom-checkbox
-              input.custom-control-input(type="checkbox", :value='group.key' v-model="workingGuild.categories")
+              input.custom-control-input(type="checkbox", :value="group.key", v-model="workingGuild.categories")
               span.custom-control-indicator
               span.custom-control-description(v-once) {{ $t(group.label) }}
           button.btn.btn-primary(@click.prevent="toggleCategorySelect") {{$t('close')}}
diff --git a/website/client/components/tasks/column.vue b/website/client/components/tasks/column.vue
index 623ca97d81..8b047d75d7 100644
--- a/website/client/components/tasks/column.vue
+++ b/website/client/components/tasks/column.vue
@@ -1,18 +1,21 @@
 <template lang="pug">
 .tasks-column
+  b-modal(ref="editTaskModal")
+    span Hello From My Modal!
   .d-flex
     h2.tasks-column-title(v-once) {{ $t(types[type].label) }}
     .filters.d-flex.justify-content-end
       .filter.small-text(
         v-for="filter in types[type].filters",
         :class="{active: activeFilter.label === filter.label}",
-        @click="activeFilter = filter",
+        @click="activateFilter(type, filter)",
       ) {{ $t(filter.label) }}
   .tasks-list
     task(
       v-for="task in tasks[`${type}s`]", 
       :key="task.id", :task="task", 
       v-if="filterTask(task)",
+      @editTask="editTask",
     )
     .bottom-gradient
     .column-background(v-if="isUser === true", :class="{'initial-description': tasks[`${type}s`].length === 0}")
@@ -129,16 +132,18 @@
 
 <script>
 import Task from './task';
-import { mapState } from 'client/libs/store';
+import { mapState, mapActions } from 'client/libs/store';
 import { shouldDo } from 'common/script/cron';
 import habitIcon from 'assets/svg/habit.svg';
 import dailyIcon from 'assets/svg/daily.svg';
 import todoIcon from 'assets/svg/todo.svg';
 import rewardIcon from 'assets/svg/reward.svg';
+import bModal from 'bootstrap-vue/lib/components/modal';
 
 export default {
   components: {
     Task,
+    bModal,
   },
   props: ['type', 'isUser', 'searchText', 'selectedTags'],
   data () {
@@ -188,6 +193,7 @@ export default {
       types,
       activeFilter: types[this.type].filters.find(f => f.default === true),
       icons,
+      openedCompletedTodos: false,
     };
   },
   computed: {
@@ -197,6 +203,16 @@ export default {
     }),
   },
   methods: {
+    ...mapActions({loadCompletedTodos: 'tasks:fetchCompletedTodos'}),
+    editTask (task) {
+      this.$emit('editTask', task);
+    },
+    activateFilter (type, filter) {
+      if (type === 'todo' && filter.label === 'complete2') {
+        this.loadCompletedTodos();
+      }
+      this.activeFilter = filter;
+    },
     filterTask (task) {
       // View
       if (!this.activeFilter.filter(task)) return false;
diff --git a/website/client/components/tasks/task.vue b/website/client/components/tasks/task.vue
index 7c486c8b04..79d8d5807f 100644
--- a/website/client/components/tasks/task.vue
+++ b/website/client/components/tasks/task.vue
@@ -10,15 +10,16 @@
       .svg-icon.check(v-html="icons.check", v-if="task.completed")
   // Task title, description and icons
   .task-content(:class="contentClass")
-    h3.task-title(:class="{ 'has-notes': task.notes }", v-markdown="task.text")
-    .task-notes.small-text(v-markdown="task.notes")
+    .task-clickable-area(@click="edit($event, task)")
+      h3.task-title(:class="{ 'has-notes': task.notes }", v-markdown="task.text")
+      .task-notes.small-text(v-markdown="task.notes")
     .checklist(v-if="task.checklist && task.checklist.length > 0")
-        label.custom-control.custom-checkbox.checklist-item(
-          v-for="item in task.checklist", :class="{'checklist-item-done': item.completed}",
-        )
-          input.custom-control-input(type="checkbox", :checked="item.completed")
-          span.custom-control-indicator
-          span.custom-control-description {{ item.text }}
+      label.custom-control.custom-checkbox.checklist-item(
+        v-for="item in task.checklist", :class="{'checklist-item-done': item.completed}",
+      )
+        input.custom-control-input(type="checkbox", :checked="item.completed")
+        span.custom-control-indicator
+        span.custom-control-description {{ item.text }}
     .icons.small-text.d-flex.align-items-center
       .d-flex.align-items-center(v-if="task.type === 'todo' && task.date", :class="{'due-overdue': isDueOverdue}")
         .svg-icon.calendar(v-html="icons.calendar")
@@ -67,12 +68,13 @@
 }
 
 .task-title {
-  margin-bottom: 8px;
+  padding-bottom: 8px;
   color: $gray-10;
   font-weight: normal;
+  margin-bottom: 0px;
 
   &.has-notes {
-    margin-bottom: 0px;
+    padding-bottom: 0px;
   }
 }
 
@@ -98,6 +100,7 @@
   line-height: 1.43;
   margin-bottom: 10px;
   min-height: 0px;
+  width: 100%;
 
   &-done {
     color: $gray-300;
@@ -178,34 +181,13 @@
 .left-control {
   border-top-left-radius: 2px;
   border-bottom-left-radius: 2px;
+  min-height: 60px;
 }
 
 .right-control {
   border-top-right-radius: 2px;
   border-bottom-right-radius: 2px;
-}
-
-.task-control {
-  width: 28px;
-  height: 28px;
-}
-
-.habit-control {
-  border-radius: 100px;
-  color: $white;
-
-  .svg-icon {
-    width: 10px;
-    margin: 0 auto;
-  }
-
-  .positive {
-    margin-top: 9px;
-  }
-
-  .negative {
-    margin-top: 13px;
-  }
+  min-height: 56px;
 }
 
 .daily-todo-control {
@@ -215,8 +197,8 @@
 
 .reward-control {
   flex-direction: column;
-  padding-top: 16px;
-  padding-bottom: 12px;
+  padding-top: 8px;
+  padding-bottom: 4px;
 
   .svg-icon {
     width: 24px;
@@ -271,7 +253,6 @@ import checkIcon from 'assets/svg/check.svg';
 import bPopover from 'bootstrap-vue/lib/components/popover';
 import markdownDirective from 'client/directives/markdown';
 
-
 export default {
   components: {
     bPopover,
@@ -330,5 +311,17 @@ export default {
       return this.$t('dueIn', {dueIn});
     },
   },
+  methods: {
+    edit (e, task) {
+      // Prevent clicking on a link from opening the edit modal
+      const target = e.target || e.srcElement;
+
+      if (target.tagName === 'A') { // Link
+        return;
+      } else {
+        this.$emit('editTask', task);
+      }
+    },
+  },
 };
 </script>
\ No newline at end of file
diff --git a/website/client/components/tasks/taskModal.vue b/website/client/components/tasks/taskModal.vue
new file mode 100644
index 0000000000..dcaeb955a3
--- /dev/null
+++ b/website/client/components/tasks/taskModal.vue
@@ -0,0 +1,457 @@
+<template lang="pug">
+form(
+  v-if="task",
+  @submit.stop.prevent="submit()",
+)
+  b-modal#task-modal(
+    size="sm",
+    @hidden="cancel()",
+  )
+    .task-modal-header(
+      slot="modal-header",
+      :class="[cssClass]",
+    )
+      h1 {{ title }}
+      .form-group
+        label(v-once) {{ `${$t('title')}*` }}
+        input.form-control(type='text', :class="[`${cssClass}-modal-input`]", required, v-model="task.text")
+      .form-group
+        label(v-once) {{ $t('notes') }}
+        textarea.form-control(:class="[`${cssClass}-modal-input`]", v-model="task.notes", rows="3")
+    .task-modal-content
+      .option(v-if="task.type === 'reward'")
+        label(v-once) {{ $t('cost') }}
+        input(type="number", v-model="task.value", required, min="0")
+      .option(v-if="['daily', 'todo'].indexOf(task.type) > -1")
+        label(v-once) {{ $t('checklist') }}
+        br
+        .checklist-group.input-group(v-for="(item, $index) in task.checklist")
+          input.checklist-item.form-control(type="text", :value="item.text")
+          span.input-group-btn(@click="removeChecklistItem($index)")
+            .svg-icon.destroy-icon(v-html="icons.destroy")
+        input.checklist-item.form-control(type="text", :placeholder="$t('newChecklistItem')", @keydown.enter="addChecklistItem($event)", v-model="newChecklistItem")
+      .d-flex.justify-content-center(v-if="task.type === 'habit'")
+        .option-item(:class="{'option-item-selected': task.up === true}", @click="task.up = !task.up")
+          .option-item-box
+            .task-control.habit-control(:class="controlClass.up + '-control-habit'")
+              .svg-icon.positive(v-html="icons.positive")
+          .option-item-label(v-once) {{ $t('positive') }}
+        .option-item(:class="{'option-item-selected': task.down === true}", @click="task.down = !task.down")
+          .option-item-box
+            .task-control.habit-control(:class="controlClass.down + '-control-habit'")
+              .svg-icon.negative(v-html="icons.negative")
+          .option-item-label(v-once) {{ $t('negative') }}
+      template(v-if="task.type !== 'reward'")
+        label(v-once) 
+          span.float-left {{ $t('difficulty') }}
+          .svg-icon.info-icon(v-html="icons.information")
+        .d-flex.justify-content-center
+          .option-item(:class="{'option-item-selected': task.priority === 0.1}", @click="task.priority = 0.1")
+            .option-item-box
+              .svg-icon.difficulty-trivial-icon(v-html="icons.difficultyTrivial")
+            .option-item-label(v-once) {{ $t('trivial') }}
+          .option-item(:class="{'option-item-selected': task.priority === 1}", @click="task.priority = 1")
+            .option-item-box
+              .svg-icon.difficulty-normal-icon(v-html="icons.difficultyNormal")
+            .option-item-label(v-once) {{ $t('easy') }}
+          .option-item(:class="{'option-item-selected': task.priority === 1.5}", @click="task.priority = 1.5")
+            .option-item-box
+              .svg-icon.difficulty-medium-icon(v-html="icons.difficultyMedium")
+            .option-item-label(v-once) {{ $t('medium') }}
+          .option-item(:class="{'option-item-selected': task.priority === 2}", @click="task.priority = 2")
+            .option-item-box
+              .svg-icon.difficulty-hard-icon(v-html="icons.difficultyHard")
+            .option-item-label(v-once) {{ $t('hard') }}
+      .option(v-if="task.type === 'todo'")
+        label(v-once) {{ $t('dueDate') }}
+        datepicker(v-model="task.date")
+      .option(v-if="task.type === 'daily'")
+        label(v-once) {{ $t('startDate') }}
+        datepicker(v-model="task.startDate")
+      .option(v-if="task.type === 'daily'")
+        label(v-once) {{ $t('repeats') }}
+        b-dropdown(:text="$t(task.frequency)")
+          b-dropdown-item(v-for="frequency in ['daily', 'weekly', 'monthly', 'yearly']", :key="frequency", @click="task.frequency = frequency", :class="{active: task.frequency === frequency}")
+            | {{ $t(frequency) }}
+        label(v-once) {{ $t('repeatEvery') }}
+        input.form-control(type="number", v-model="task.everyX", min="0", required)
+        | {{ repeatSuffix }}
+        template(v-if="task.frequency === 'weekly'")
+          .form-check(
+            v-for="(day, dayNumber) in dayMapping",
+            :key="dayNumber",
+          )
+            label.custom-control.custom-checkbox
+              input.custom-control-input(type="checkbox", v-model="task.repeat[day]")
+              span.custom-control-indicator
+              span.custom-control-description(v-once) {{ weekdaysMin(dayNumber) }}
+        template(v-if="task.frequency === 'monthly'")
+          label.custom-control.custom-radio
+            input.custom-control-input(type='radio', v-model="repeatsOn", value="dayOfMonth") 
+            span.custom-control-indicator
+            span.custom-control-description {{ $t('dayOfMonth') }}
+          label.custom-control.custom-radio
+            input.custom-control-input(type='radio', v-model="repeatsOn", value="dayOfWeek") 
+            span.custom-control-indicator
+            span.custom-control-description {{ $t('dayOfWeek') }}
+
+      .option
+        label(v-once) {{ $t('tags') }}
+        .category-wrap(@click="showTagsSelect = !showTagsSelect")
+          span.category-select(v-if='task.tags.length === 0') {{$t('none')}}
+          span.category-select(v-else) {{getTagsFor(task)[0]}}
+        .category-box(v-if="showTagsSelect")
+          .form-check(
+            v-for="tag in user.tags",
+            :key="tag.id",
+          )
+            label.custom-control.custom-checkbox
+              input.custom-control-input(type="checkbox", :value="tag.id", v-model="task.tags")
+              span.custom-control-indicator
+              span.custom-control-description(v-once) {{ tag.name }}
+          button.btn.btn-primary(@click="showTagsSelect = !showTagsSelect") {{$t('close')}}
+      .option(v-if="task.type === 'habit'")
+        label(v-once) {{ $t('resetStreak') }}
+        b-dropdown(:text="$t(task.frequency)")
+          b-dropdown-item(v-for="frequency in ['daily', 'weekly', 'monthly']", :key="frequency", @click="task.frequency = frequency", :class="{active: task.frequency === frequency}")
+            | {{ $t(frequency) }}
+
+    .task-modal-footer(slot="modal-footer")
+      button.btn.btn-primary(type="submit", v-once) {{ $t('save') }}
+      span.cancel-task-btn(v-once, v-if="purpose === 'create'", @click="cancel()") {{ $t('cancel') }}
+      span.delete-task-btn(v-once, v-else, @click="destroy()") {{ $t('delete') }}
+</template>
+
+<style lang="scss">
+@import '~client/assets/scss/colors.scss';
+
+#task-modal {
+  .modal-dialog.modal-sm {
+    max-width: 448px;
+  }
+
+  label {
+    font-weight: bold;
+  }
+
+  input, textarea {
+    border: none;
+    background-color: rgba(0, 0, 0, 0.16);
+
+    &:focus {
+      color: $white !important;
+    }
+  }
+
+  .modal-content {
+    border-radius: 8px;
+    border: none;
+  }
+
+  .modal-header, .modal-body, .modal-footer {
+    padding: 0px;
+    border: none;
+  }
+
+  .task-modal-content, .task-modal-header {
+    padding-left: 23px;
+    padding-right: 23px;
+  }
+
+  .task-modal-header {
+    color: $white;
+    width: 100%;
+    border-top-left-radius: 8px;
+    border-top-right-radius: 8px;
+    padding-top: 16px;
+    padding-bottom: 24px;
+
+    h1 {
+      color: $white;
+    }
+  }
+
+  .task-modal-content {
+    padding-top: 24px;
+
+    input {
+      background: $white;
+      border: 1px solid $gray-500;
+      color: $gray-200;
+
+      &:focus {
+        color: $gray-50 !important;
+      }
+    }
+  }
+
+  .info-icon {
+    float: left;
+    height: 16px;
+    width: 16px;
+    margin-left: 8px;
+    margin-top: 2px;
+  }
+
+  .difficulty-trivial-icon {
+    width: 16px;
+    height: 16px;
+  }
+
+  .difficulty-normal-icon {
+    width: 36px;
+    height: 16px;
+  }
+
+  .difficulty-medium-icon {
+    width: 36px;
+    height: 32px;
+  }
+
+  .difficulty-hard-icon {
+    width: 36px;
+    height: 36px;
+  }
+
+  .option {
+    margin-bottom: 12px;
+    margin-top: 12px;
+    position: relative;
+  }
+
+  .option-item {
+    margin-right: 48px;
+    cursor: pointer;
+
+    &:last-child {
+      margin-right: 0px;
+    }
+
+    &-box {
+      width: 64px;
+      height: 64px;
+      border-radius: 2px;
+      background: $gray-600;
+      margin-bottom: 8px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      .habit-control.task-habit-disabled-control-habit {
+        color: $white !important;
+        border: none;
+        background: $gray-300;
+      }
+    }
+
+    &-label {
+      color: $gray-50;
+      text-align: center;
+    }
+  }
+
+  .category-wrap {
+    cursor: pointer;
+    margin-top: 0px;
+  }
+
+  .category-box {
+    bottom: 0px;
+    left: 40px;
+    top: auto;
+  }
+
+  .checklist-group {
+    border-top: 1px solid $gray-500;
+
+    .input-group-btn {
+      cursor: pointer;
+      padding-left: 10px;
+      padding-right: 10px;
+    }
+
+    .destroy-icon {
+      width: 14px;
+      height: 16px;
+    }
+  }
+
+  .checklist-item {
+    margin-bottom: 0px;
+    border-radius: 0px;
+    border: none !important;
+    padding-left: 36px;
+
+    &:last-child {
+      background-size: 10px 10px;
+      background-image: url(~client/assets/svg/for-css/positive.svg);
+      background-repeat: no-repeat;
+      background-position: center left 10px;
+      border-top: 1px solid $gray-500 !important;
+      border-bottom: 1px solid $gray-500 !important;
+    }
+  } 
+
+  .task-modal-footer {
+    margin: 0 auto;
+    padding-bottom: 24px;
+    border-top-left-radius: 8px;
+    border-top-right-radius: 8px;
+    margin-top: 50px;
+
+    .delete-task-btn, .cancel-task-btn {
+      margin-left: 16px;
+      cursor: pointer;
+
+      &:hover, &:focus, &:active {
+        text-decoration: underline;
+      }
+    }
+
+    .delete-task-btn {
+      color: $red-50;
+    }
+
+    .cancel-task-btn {
+      color: $blue-10;
+    }
+  }
+}
+</style>
+
+<script>
+import bModal from 'bootstrap-vue/lib/components/modal';
+import { mapGetters, mapActions, mapState } from 'client/libs/store';
+import bDropdown from 'bootstrap-vue/lib/components/dropdown';
+import bDropdownItem from 'bootstrap-vue/lib/components/dropdown-item';
+import Datepicker from 'vuejs-datepicker';
+import moment from 'moment';
+
+import informationIcon from 'assets/svg/information.svg';
+import difficultyTrivialIcon from 'assets/svg/difficulty-trivial.svg';
+import difficultyMediumIcon from 'assets/svg/difficulty-medium.svg';
+import difficultyHardIcon from 'assets/svg/difficulty-hard.svg';
+import difficultyNormalIcon from 'assets/svg/difficulty-normal.svg';
+import positiveIcon from 'assets/svg/positive.svg';
+import negativeIcon from 'assets/svg/negative.svg';
+import deleteIcon from 'assets/svg/delete.svg';
+
+export default {
+  components: {
+    bModal,
+    bDropdown,
+    bDropdownItem,
+    Datepicker,
+  },
+  props: ['task', 'purpose'], // purpose is either create or edit, task is the task created or edited
+  data () {
+    return {
+      showTagsSelect: false,
+      newChecklistItem: null,
+      icons: Object.freeze({
+        information: informationIcon,
+        difficultyNormal: difficultyNormalIcon,
+        difficultyTrivial: difficultyTrivialIcon,
+        difficultyMedium: difficultyMediumIcon,
+        difficultyHard: difficultyHardIcon,
+        negative: negativeIcon,
+        positive: positiveIcon,
+        destroy: deleteIcon,
+      }),
+    };
+  },
+  computed: {
+    ...mapGetters({
+      getTaskClasses: 'tasks:getTaskClasses',
+      getTagsFor: 'tasks:getTagsFor',
+    }),
+    ...mapState({
+      user: 'user.data',
+      dayMapping: 'constants.DAY_MAPPING',
+    }),
+    title () {
+      const type = this.$t(this.task.type);
+      return this.$t(this.purpose === 'edit' ? 'editATask' : 'createTask', {type});
+    },
+    cssClass () {
+      return this.getTaskClasses(this.task, this.purpose === 'edit' ? 'editModal' : 'createModal');
+    },
+    controlClass () {
+      return this.getTaskClasses(this.task, this.purpose === 'edit' ? 'control' : 'controlCreate');
+    },
+    repeatSuffix () {
+      const task = this.task;
+
+      if (task.frequency === 'daily') {
+        return task.everyX === 1 ? this.$t('day') : this.$t('days');
+      } else if (task.frequency === 'weekly') {
+        return task.everyX === 1 ? this.$t('week') : this.$t('weeks');
+      } else if (task.frequency === 'monthly') {
+        return task.everyX === 1 ? this.$t('month') : this.$t('months');
+      } else if (task.frequency === 'yearly') {
+        return task.everyX === 1 ? this.$t('year') : this.$t('years');
+      }
+    },
+    repeatsOn: {
+      get () {
+        let repeatsOn = 'dayOfMonth';
+
+        if (this.task.type === 'daily' && this.task.weeksOfMonth && this.task.weeksOfMonth.length > 0) {
+          repeatsOn = 'dayOfWeek';
+        }
+
+        return repeatsOn;
+      },
+      set (newValue) {
+        const task = this.task;
+
+        if (task.frequency === 'monthly' && newValue === 'dayOfMonth') {
+          const date = moment(task.startDate).date();
+          task.weeksOfMonth = [];
+          task.daysOfMonth = [date];
+        } else if (task.frequency === 'monthly' && newValue === 'dayOfWeek') {
+          const week = Math.ceil(moment(task.startDate).date() / 7) - 1;
+          const dayOfWeek = moment(task.startDate).day();
+          const shortDay = this.dayMapping[dayOfWeek];
+          task.daysOfMonth = [];
+          task.weeksOfMonth = [week];
+          for (let key in task.repeat) {
+            task.repeat[key] = false;
+          }
+          task.repeat[shortDay] = true;
+        }
+      },
+    },
+  },
+  methods: {
+    ...mapActions({saveTask: 'tasks:save', destroyTask: 'tasks:destroy', createTask: 'tasks:create'}),
+    addChecklistItem (e) {
+      this.task.checklist.push({text: this.newChecklistItem, completed: false});
+      this.newChecklistItem = null;
+      e.preventDefault();
+    },
+    removeChecklistItem (i) {
+      this.task.checklist.splice(i, 1);
+    },
+    weekdaysMin (dayNumber) {
+      return moment.weekdaysMin(dayNumber);
+    },
+    submit () {
+      if (this.purpose === 'create') {
+        this.createTask(this.task);
+      } else {
+        this.saveTask(this.task);
+      }
+      this.$root.$emit('hide::modal', 'task-modal');
+    },
+    destroy () {
+      this.destroyTask(this.task);
+      this.$root.$emit('hide::modal', 'task-modal');
+    },
+    cancel () {
+      this.showTagsSelect = false;
+      this.$emit('cancel');
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/website/client/components/tasks/user.vue b/website/client/components/tasks/user.vue
index 822f0978c5..f18643b59e 100644
--- a/website/client/components/tasks/user.vue
+++ b/website/client/components/tasks/user.vue
@@ -1,5 +1,11 @@
 <template lang="pug">
 .row.user-tasks-page
+  task-modal(
+    :task="editingTask || creatingTask",
+    :purpose="creatingTask !== null ? 'create' : 'edit'",
+    @cancel="cancelTaskModal()",
+    ref="taskModal",
+  )
   .col-12
     .row.tasks-navigation
       .col-4.offset-4
@@ -32,21 +38,26 @@
             button.btn.btn-secondary.filter-button(
               type="button", 
               @click="toggleFilterPanel()",
-              :class="{open: isFilterPanelOpen}",
+              :class="{'filter-button-open': selectedTags.length > 0}",
             )
               .d-flex.align-items-center
                 span(v-once) {{ $t('filter') }}
                 .svg-icon.filter-icon(v-html="icons.filter")
       .col-1.offset-3
-        button.btn.btn-success(v-once) 
+        //button.btn.btn-success(v-once) 
           .svg-icon.positive(v-html="icons.positive")
           | {{ $t('create') }}
+        b-dropdown(:text="$t('create')")
+          b-dropdown-item(v-for="type in columns", :key="type", @click="createTask(type)")
+            | {{$t(type)}}
+
     .row.tasks-columns
       task-column.col-3(
         v-for="column in columns", 
         :type="column", :key="column", 
         :isUser="true", :searchText="searchTextThrottled",
         :selectedTags="selectedTags",
+        @editTask="editTask",
       )
 </template>
 
@@ -69,7 +80,7 @@
   padding-top: 6px;
 }
 
-.filter-button {
+button.btn.btn-secondary.filter-button {
   box-shadow: none;
   border-radius: 2px;
   border: 1px solid $gray-400 !important;
@@ -77,12 +88,21 @@
   &:hover, &:active, &:focus, &.open {
     box-shadow: none; 
     border-color: $purple-500 !important;
+    color: $gray-50 !important;
+  }
+
+  &.filter-button-open {
+    color: $purple-200 !important;
+
+    .filter-icon {
+      color: $purple-200 !important;
+    }
   }
 
   .filter-icon {
     height: 10px;
     width: 12px;
-    color: $green-500;
+    color: $gray-50;
     margin-left: 15px;
   }
 }
@@ -154,15 +174,26 @@
 </style>
 
 <script>
-import Column from './column';
+import TaskColumn from './column';
+import TaskModal from './taskModal';
+
 import positiveIcon from 'assets/svg/positive.svg';
 import filterIcon from 'assets/svg/filter.svg';
+
+import Vue from 'vue';
+import bDropdown from 'bootstrap-vue/lib/components/dropdown';
+import bDropdownItem from 'bootstrap-vue/lib/components/dropdown-item';
 import throttle from 'lodash/throttle';
+import cloneDeep from 'lodash/cloneDeep';
 import { mapState } from 'client/libs/store';
+import taskDefaults from 'common/script/libs/taskDefaults';
 
 export default {
   components: {
-    TaskColumn: Column,
+    TaskColumn,
+    TaskModal,
+    bDropdown,
+    bDropdownItem,
   },
   data () {
     return {
@@ -176,6 +207,8 @@ export default {
       }),
       selectedTags: [],
       temporarilySelectedTags: [],
+      editingTask: null,
+      creatingTask: null,
     };
   },
   computed: {
@@ -216,6 +249,24 @@ export default {
     }, 250),
   },
   methods: {
+    editTask (task) {
+      this.editingTask = cloneDeep(task);
+      // Necessary otherwise the first time the modal is not rendered
+      Vue.nextTick(() => {
+        this.$root.$emit('show::modal', 'task-modal');
+      });
+    },
+    createTask (type) {
+      this.creatingTask = taskDefaults({type, text: ''});
+      // Necessary otherwise the first time the modal is not rendered
+      Vue.nextTick(() => {
+        this.$root.$emit('show::modal', 'task-modal');
+      });
+    },
+    cancelTaskModal () {
+      this.editingTask = null;
+      this.creatingTask = null;
+    },
     toggleFilterPanel () {
       if (this.isFilterPanelOpen === true) {
         this.closeFilterPanel();
diff --git a/website/client/store/actions/tasks.js b/website/client/store/actions/tasks.js
index 71ceca0221..a5a6766762 100644
--- a/website/client/store/actions/tasks.js
+++ b/website/client/store/actions/tasks.js
@@ -1,6 +1,7 @@
 import { loadAsyncResource } from 'client/libs/asyncResource';
-
+import axios from 'axios';
 import compact from 'lodash/compact';
+import omit from 'lodash/omit';
 
 export function fetchUserTasks (store, forceLoad = false) {
   return loadAsyncResource({
@@ -18,6 +19,37 @@ export function fetchUserTasks (store, forceLoad = false) {
   });
 }
 
+export async function fetchCompletedTodos (store, forceLoad = false) {
+  // Wait for the user to be loaded before deserializing
+  // because user.tasksOrder is necessary
+  await store.dispatch('tasks:fetchUserTasks');
+
+  const loadStatus = store.state.completedTodosStatus;
+  if (loadStatus === 'NOT_LOADED' || forceLoad) {
+    store.state.completedTodosStatus = 'LOADING';
+
+    const response = await axios.get('/api/v3/tasks/user?type=completedTodos');
+    const completedTodos = response.data.data;
+    const tasks = store.state.tasks.data;
+    // Remove existing completed todos
+    tasks.todos = tasks.todos.filter(t => !t.completed);
+    tasks.todos.push(...completedTodos);
+
+    store.state.completedTodosStatus = 'LOADED';
+  } else if (status === 'LOADED') {
+    return;
+  } else if (loadStatus === 'LOADING') {
+    const watcher = store.watch(state => state.completedTodosStatus, (newLoadingStatus) => {
+      watcher(); // remove the watcher
+      if (newLoadingStatus === 'LOADED') {
+        return;
+      } else {
+        throw new Error(); // TODO add reason?
+      }
+    });
+  }
+}
+
 export function order (store, [rawTasks, tasksOrder]) {
   const tasks = {
     habits: [],
@@ -51,4 +83,49 @@ export function order (store, [rawTasks, tasksOrder]) {
   });
 
   return tasks;
+}
+
+function sanitizeChecklist (task) {
+  if (task.checklist) {
+    task.checklist = task.checklist.filter((i) => {
+      return Boolean(i.text);
+    });
+  }
+}
+export async function create (store, createdTask) {
+  const type = `${createdTask.type}s`;
+  const list = store.state.tasks.data[type];
+
+  sanitizeChecklist(createdTask);
+
+  list.unshift(createdTask);
+  store.state.user.data.tasksOrder[type].unshift(createdTask._id);
+  const response = await axios.post('/api/v3/tasks/user', createdTask);
+
+  Object.assign(list[0], response.data.data);
+}
+
+export async function save (store, editedTask) {
+  const taskId = editedTask._id;
+  const type = editedTask.type;
+  const originalTask = store.state.tasks.data[`${type}s`].find(t => t._id === taskId);
+
+  sanitizeChecklist(editedTask);
+
+  Object.assign(originalTask, editedTask);
+
+  const taskDataToSend = omit(originalTask, ['history']);
+  const response = await axios.put(`/api/v3/tasks/${originalTask._id}`, taskDataToSend);
+  Object.assign(originalTask, response.data.data);
+}
+
+export async function destroy (store, task) {
+  const list = store.state.tasks.data[`${task.type}s`];
+  const taskIndex = list.findIndex(t => t._id === task._id);
+
+  if (taskIndex > -1) {
+    list.splice(taskIndex, 1);
+  }
+
+  await axios.delete(`/api/v3/tasks/${task._id}`);
 }
\ No newline at end of file
diff --git a/website/client/store/getters/tasks.js b/website/client/store/getters/tasks.js
index 72c9e7c419..5f6ae24a45 100644
--- a/website/client/store/getters/tasks.js
+++ b/website/client/store/getters/tasks.js
@@ -37,6 +37,11 @@ export function getTaskClasses (store) {
         return 'task-purple';
       case 'editModal':
         return type === 'reward' ? 'task-purple' : getTaskColorByValue(task.value);
+      case 'controlCreate':
+        return {
+          up: task.up ? 'task-purple' : 'task-habit-disabled',
+          down: task.down ? 'task-purple' : 'task-habit-disabled',
+        };
       case 'control':
         switch (type) {
           case 'daily':
diff --git a/website/client/store/index.js b/website/client/store/index.js
index 04119885e1..3908d60e2c 100644
--- a/website/client/store/index.js
+++ b/website/client/store/index.js
@@ -1,7 +1,8 @@
 import Store from 'client/libs/store';
 import deepFreeze from 'client/libs/deepFreeze';
 import content from 'common/script/content/index';
-import * as constants from 'common/script/constants';
+import * as commonConstants from 'common/script/constants';
+import { DAY_MAPPING } from 'common/script/cron';
 import { asyncResourceFactory } from 'client/libs/asyncResource';
 import axios from 'axios';
 
@@ -39,6 +40,7 @@ export default function () {
       isUserLoggedIn,
       user: asyncResourceFactory(),
       tasks: asyncResourceFactory(), // user tasks
+      completedTodosStatus: 'NOT_LOADED',
       party: {
         quest: {},
         members: asyncResourceFactory(),
@@ -59,7 +61,7 @@ export default function () {
       // TODO apply freezing to the entire codebase (the server) and not only to the client side?
       // NOTE this takes about 10-15ms on a fast computer
       content: deepFreeze(content),
-      constants: deepFreeze(constants),
+      constants: deepFreeze({...commonConstants, DAY_MAPPING}),
       hideHeader: false,
       viewingMembers: [],
     },
diff --git a/website/common/locales/en/newClient.json b/website/common/locales/en/newClient.json
index f6d1484a5d..eacc97940d 100644
--- a/website/common/locales/en/newClient.json
+++ b/website/common/locales/en/newClient.json
@@ -213,6 +213,15 @@
   "challengeInformationPlaceHolder": "Write a short description advertising your Challenge to other Habiticans. What is the main purpose of your Challenge and why should people join it? Try to include useful keywords in the description so that Habiticans can easily find it when they search!",
   "where": "Where*",
   "challengeMinimum": "Minimum 1 Gem for public Challenges (helps prevent spam, it really does).",
+  "editATask": "Edit a <%= type %>",
+  "createTask": "Create <%= type %>",
+  "notes": "Notes",
+  "positive": "Positive",
+  "negative": "Negative",
+  "resetStreak": "Reset Streak",
+  "newChecklistItem": "New checklist item",
+  "repeats": "Repeats",
+  "cost": "Cost",
   "group": "Group",
   "sortByType": "Type",
   "sortByPrice": "Price",