From ce7490bc901d3eacc5459964d7ccf33ef49114c6 Mon Sep 17 00:00:00 2001
From: Tony Air <tony@thewebdevelopmentagency.com>
Date: Mon, 2 Jul 2018 08:54:18 +0700
Subject: [PATCH] Bunch of structural upgrades and module integrations

---
 app/_config.php                               |    5 +-
 app/_config/captcha.yml                       |   13 +
 app/_config/elements.yml                      |   46 +-
 app/_config/extensions.yml                    |   12 +
 .../src/js/_components/_ui.form.storage.js    |  175 +-
 app/client/src/js/main.js                     |    2 +-
 app/client/src/scss/_bootstrap_variables.scss |   10 -
 app/client/src/scss/_layout.scss              |   11 -
 app/client/src/scss/_typography.scss          |    7 +-
 app/client/src/scss/_variables.scss           |   36 +-
 app/client/src/scss/app.scss                  |   88 +-
 app/client/src/scss/types/editor.scss         |    2 +-
 app/composer.json                             |   11 +
 app/src/Elements/TeamMembersElement.php       |   30 +
 app/src/Extensions/BlogPostExtension.php      |   40 +
 app/src/Extensions/ElementContentWidget.php   |   41 +
 app/src/Extensions/ElementImageWidget.php     |  111 +
 app/src/Extensions/ElementRows.php            |  131 +-
 app/src/Extensions/HiddenType.php             |   17 +
 app/src/Extensions/SiteConfigExtension.php    |   35 +-
 app/src/Extensions/SiteTreeExtension.php      |   28 +
 app/src/Extensions/SocialExtension.php        |   63 +
 app/src/Models/TeamMember.php                 |   54 +
 app/src/Pages/HomePage.php                    |    1 +
 app/src/Pages/HomePageController.php          |    1 +
 app/src/Pages/PageController.php              |    5 +
 app/src/Pages/TeamPage.php                    |   42 +
 app/src/Pages/TeamPageController.php          |   15 +
 .../Elemental/Layout/ElementHolder.ss         |    5 +
 .../Elemental/Models/ElementContent.ss        |   18 +
 .../ElementalUserForms/Model/ElementForm.ss   |   10 +
 .../Blog/Elements/ElementBlogPosts.ss         |   14 +
 .../Elements/Elements/ElementTestimonials.ss  |   14 +
 .../Elements/Image/Elements/ElementImage.ss   |   26 +-
 app/templates/Includes/BlogPostInfo.ss        |   25 +
 app/templates/Includes/Content.ss             |   10 +-
 app/templates/Includes/FlexSlider.ss          |   24 +-
 app/templates/Includes/Footer.ss              |   65 +
 app/templates/Includes/Header.ss              |   26 +
 .../Includes/{Head.ss => MetaHead.ss}         |    0
 app/templates/Includes/NavItem.ss             |    4 +-
 app/templates/Includes/Navigation.ss          |   12 +-
 app/templates/Objects/HCard.ss                |   33 +
 app/templates/Objects/SocialLinks.ss          |   32 +
 app/templates/Objects/Testimonial.ss          |   16 +
 app/templates/Page.ss                         |   43 +-
 .../Sheadawson/Linkable/Models/Link.ss        |   10 +
 .../Sheadawson/Linkable/Models/Link_button.ss |    3 +
 .../Linkable/Models/Link_buttonghost.ss       |    3 +
 .../SilverStripe/Blog/Includes/EntryMeta.ss   |   46 +
 .../SilverStripe/Blog/Model/Layout/Blog.ss    |   45 +
 .../Blog/Model/Layout/BlogPost.ss             |   35 +
 .../Blog/Model/Layout/Blog_profile.ss         |   23 +
 .../Site/Elements/TeamMembersElement.ss       |   17 +
 composer.json                                 |   21 +-
 package-lock.json                             | 3985 +++++++++++++----
 package.json                                  |    3 +-
 webpack.config.common.js                      |    2 +-
 webpack.config.prod.js                        |   11 +-
 59 files changed, 4432 insertions(+), 1181 deletions(-)
 create mode 100644 app/_config/captcha.yml
 delete mode 100644 app/client/src/scss/_bootstrap_variables.scss
 create mode 100644 app/composer.json
 create mode 100644 app/src/Elements/TeamMembersElement.php
 create mode 100644 app/src/Extensions/BlogPostExtension.php
 create mode 100644 app/src/Extensions/ElementContentWidget.php
 create mode 100644 app/src/Extensions/ElementImageWidget.php
 create mode 100644 app/src/Extensions/HiddenType.php
 create mode 100644 app/src/Extensions/SiteTreeExtension.php
 create mode 100644 app/src/Extensions/SocialExtension.php
 create mode 100644 app/src/Models/TeamMember.php
 create mode 100644 app/src/Pages/TeamPage.php
 create mode 100644 app/src/Pages/TeamPageController.php
 create mode 100644 app/templates/DNADesign/Elemental/Layout/ElementHolder.ss
 create mode 100644 app/templates/DNADesign/Elemental/Models/ElementContent.ss
 create mode 100644 app/templates/DNADesign/ElementalUserForms/Model/ElementForm.ss
 create mode 100644 app/templates/Dynamic/Elements/Blog/Elements/ElementBlogPosts.ss
 create mode 100644 app/templates/Dynamic/Elements/Elements/ElementTestimonials.ss
 create mode 100644 app/templates/Includes/BlogPostInfo.ss
 create mode 100644 app/templates/Includes/Footer.ss
 create mode 100644 app/templates/Includes/Header.ss
 rename app/templates/Includes/{Head.ss => MetaHead.ss} (100%)
 create mode 100644 app/templates/Objects/HCard.ss
 create mode 100644 app/templates/Objects/SocialLinks.ss
 create mode 100644 app/templates/Objects/Testimonial.ss
 create mode 100644 app/templates/Sheadawson/Linkable/Models/Link.ss
 create mode 100644 app/templates/Sheadawson/Linkable/Models/Link_button.ss
 create mode 100644 app/templates/Sheadawson/Linkable/Models/Link_buttonghost.ss
 create mode 100644 app/templates/SilverStripe/Blog/Includes/EntryMeta.ss
 create mode 100644 app/templates/SilverStripe/Blog/Model/Layout/Blog.ss
 create mode 100644 app/templates/SilverStripe/Blog/Model/Layout/BlogPost.ss
 create mode 100644 app/templates/SilverStripe/Blog/Model/Layout/Blog_profile.ss
 create mode 100644 app/templates/Site/Elements/TeamMembersElement.ss

diff --git a/app/_config.php b/app/_config.php
index 3901d65..6d8a13e 100644
--- a/app/_config.php
+++ b/app/_config.php
@@ -12,7 +12,10 @@ HtmlEditorConfig::get('cms')->enablePlugins([
     'charmap',
     'visualblocks',
     'lists',
-    'charcount' => ModuleResourceLoader::resourceURL('drmartingonzo/ss-tinymce-charcount:client/dist/js/bundle.js'),
+    'charcount' => ModuleResourceLoader::resourceURL(
+        'drmartingonzo/ss-tinymce-charcount:client/dist/js/bundle.js'
+    ),
 ]);
 
 FulltextSearchable::enable();
+
diff --git a/app/_config/captcha.yml b/app/_config/captcha.yml
new file mode 100644
index 0000000..191373a
--- /dev/null
+++ b/app/_config/captcha.yml
@@ -0,0 +1,13 @@
+SilverStripe\SpamProtection\Extension\FormSpamProtectionExtension:
+    default_spam_protector: UndefinedOffset\NoCaptcha\Forms\NocaptchaProtector
+
+UndefinedOffset\NoCaptcha\Forms\NocaptchaField:
+    site_key: "YOUR_SITE_KEY" #Your site key (required)
+    secret_key: "YOUR_SECRET_KEY" #Your secret key (required)
+    verify_ssl: true #Allows you to disable php-curl's SSL peer verification by setting this to false (optional, defaults to true)
+    default_theme: "light" #Default theme color (optional, light or dark, defaults to light)
+    default_type: "image" #Default captcha type (optional, image or audio, defaults to image)
+    default_size: "normal" #Default size (optional, normal, compact or invisible, defaults to normal)
+    default_badge: "bottomright" #Default badge position (bottomright, bottomleft or inline, defaults to bottomright)
+    proxy_server: "" #Your proxy server address (optional)
+    proxy_auth: "" #Your proxy server authentication information (optional)
\ No newline at end of file
diff --git a/app/_config/elements.yml b/app/_config/elements.yml
index 75b7a89..b463ec5 100644
--- a/app/_config/elements.yml
+++ b/app/_config/elements.yml
@@ -1,3 +1,10 @@
+---
+Name: webapp-elemental
+After:
+  - elemental
+  - elemental-list
+---
+
 Page:
   extensions:
     - DNADesign\Elemental\Extensions\ElementalPageExtension
@@ -5,7 +12,42 @@ Page:
 DNADesign\Elemental\Models\BaseElement:
   default_global_elements: true
   extensions:
-      - Site\Extensions\ElementRows
+    - Site\Extensions\ElementRows
+
+SilverStripe\CMS\Model\SiteTree:
+  allowed_elements:
+      - DNADesign\ElementalList\Model\ElementList
+      - DNADesign\Elemental\Models\ElementContent
+      - DNADesign\ElementalUserForms\Model\ElementForm
+      - Dynamic\Elements\Image\Elements\ElementImage
+      - Dynamic\Elements\Blog\Elements\ElementBlogPosts
+      - Dynamic\Elements\FlexSlider\Elements\ElementSlideshow
+      - Dynamic\Elements\Oembed\Elements\ElementOembed
+      - Dynamic\Elements\Elements\ElementTestimonials
+      - Site\Elements\TeamMembersElement
 
 DNADesign\ElementalList\Model\ElementList:
-  default_global_elements: false
\ No newline at end of file
+  default_global_elements: false
+  allowed_elements:
+      - DNADesign\ElementalList\Model\ElementList
+      - DNADesign\Elemental\Models\ElementContent
+      - DNADesign\ElementalUserForms\Model\ElementForm
+      - Dynamic\Elements\Image\Elements\ElementImage
+      - Dynamic\Elements\Blog\Elements\ElementBlogPosts
+      - Dynamic\Elements\FlexSlider\Elements\ElementSlideshow
+      - Dynamic\Elements\Oembed\Elements\ElementOembed
+      - Dynamic\Elements\Elements\ElementTestimonials
+      - Site\Elements\TeamMembersElement
+  styles:
+    whiteframe: 'White Frame'
+    greybg: 'Grey Background'
+    noframe: 'No Frame'
+
+DNADesign\Elemental\Models\ElementContent:
+  extensions:
+    - Site\Extensions\ElementContentWidget
+
+Dynamic\Elements\Image\Elements\ElementImage:
+  extensions:
+    - Site\Extensions\ElementImageWidget
+
diff --git a/app/_config/extensions.yml b/app/_config/extensions.yml
index c76095f..d1b6168 100644
--- a/app/_config/extensions.yml
+++ b/app/_config/extensions.yml
@@ -1,4 +1,16 @@
 SilverStripe\SiteConfig\SiteConfig:
   extensions:
     - Site\Extensions\SiteConfigExtension
+    - Site\Extensions\SocialExtension
 
+SilverStripe\SiteTree\SiteTree:
+  extensions:
+    - SiteTreeExtension
+
+SilverStripe\Blog\Model\BlogPost:
+  extensions:
+    - Site\Extensions\BlogPostExtension
+
+SilverStripe\Core\Injector\Injector:
+  SilverStripe\UserForms\Model\UserDefinedForm:
+    class: Site\Extensions\CMSMain_HiddenClass
diff --git a/app/client/src/js/_components/_ui.form.storage.js b/app/client/src/js/_components/_ui.form.storage.js
index 5abbb3b..8c9a0cb 100644
--- a/app/client/src/js/_components/_ui.form.storage.js
+++ b/app/client/src/js/_components/_ui.form.storage.js
@@ -2,102 +2,115 @@ import $ from 'jquery';
 import Events from "../_events";
 
 const FormStorage = (($) => {
-  // Constants
-  const NAME = 'jsFormStorage';
-  const DATA_KEY = NAME;
-  const STORAGE = window.localStorage;
+    // Constants
+    const NAME = 'jsFormStorage';
+    const DATA_KEY = NAME;
+    const STORAGE = window.localStorage;
 
-  class FormStorage {
-    // Constructor
-    constructor(element) {
-      this._element = element;
-      const $element = $(this._element);
-      const $elements = $element.find('input,textarea');
+    class FormStorage {
+        // Constructor
+        constructor(element) {
+            this._element = element;
+            const $element = $(this._element);
+            const $elements = $element.find('input,textarea');
+            const setRangeValues = function(el) {
+                let $el = $(el);
+                $el.siblings('.value').text($el.val());
+            };
 
-      $element.addClass(`${NAME}-active`);
+            $element.addClass(`${NAME}-active`);
 
-      // restore form data from localStorage
-      $elements.each(function () {
-        const id = $(this).attr('id');
-        const type = $(this).attr('type');
-        const val = STORAGE.getItem(NAME + id);
+            // restore form data from localStorage
+            $elements.each(function() {
+                const id = $(this).attr('id');
+                const type = $(this).attr('type');
+                const val = STORAGE.getItem(NAME + id);
 
-        if (id && val && type) {
-          if (type && (type === 'checkbox' || type === 'radio')) {
-            $(this).prop('checked', val);
-          } else {
-            $(this).val(val);
-          }
-        }
-      });
+                if (id && val && type) {
+                    if (type && (type === 'checkbox' || type === 'radio')) {
+                        $(this).prop('checked', val);
+                    } else {
+                        $(this).val(val);
+                    }
+                }
+            });
 
-      // store form data into localStorage
-      $elements.change(function () {
-        const id = $(this).attr('id');
-        const type = $(this).attr('type');
-        let val = $(this).val();
+            // range fields
 
-        if (type && (type === 'checkbox' || type === 'radio')) {
-          val = !!$(this).is(':checked');
+            $('input[type="range"]').each(function() {
+                setRangeValues(this);
+            });
+            $('input[type="range"]').change(function() {
+                setRangeValues(this);
+            });
+
+            // store form data into localStorage
+            $elements.change(function() {
+                const id = $(this).attr('id');
+                const type = $(this).attr('type');
+                let val = $(this).val();
+
+                if (type && (type === 'checkbox' || type === 'radio')) {
+                    val = !!$(this).is(':checked');
+                }
+
+                if (id && type && type !== 'password') {
+                    STORAGE.setItem(NAME + id, val);
+                }
+            });
+
+            $element.submit(() => {
+                $element.data(DATA_KEY).clear();
+            });
+
+            $element.find('button,[type="submit"],[type="clear"]').click(() => {
+                $element.data(DATA_KEY).clear();
+            });
         }
 
-        if (id && type && type !== 'password') {
-          STORAGE.setItem(NAME + id, val);
+        // Public methods
+        dispose() {
+            const $element = $(this._element);
+
+            $element.removeClass(`${NAME}-active`);
+            $.removeData(this._element, DATA_KEY);
+            this._element = null;
         }
-      });
 
-      $element.submit(() => {
-        $element.data(DATA_KEY).clear();
-      });
+        clear() {
+            STORAGE.clear();
+        }
 
-      $element.find('button,[type="submit"],[type="clear"]').click(() => {
-        $element.data(DATA_KEY).clear();
-      });
+        static _jQueryInterface() {
+            if (typeof window.localStorage !== 'undefined') {
+                return this.each(function() {
+                    // attach functionality to element
+                    const $element = $(this);
+                    let data = $element.data(DATA_KEY);
+
+                    if (!data) {
+                        data = new FormStorage(this);
+                        $element.data(DATA_KEY, data);
+                    }
+                });
+            }
+        }
     }
 
-    // Public methods
-    dispose() {
-      const $element = $(this._element);
+    // jQuery interface
+    $.fn[NAME] = FormStorage._jQueryInterface;
+    $.fn[NAME].Constructor = FormStorage;
+    $.fn[NAME].noConflict = function() {
+        $.fn[NAME] = JQUERY_NO_CONFLICT;
+        return FormStorage._jQueryInterface;
+    };
 
-      $element.removeClass(`${NAME}-active`);
-      $.removeData(this._element, DATA_KEY);
-      this._element = null;
-    }
+    // auto-apply
+    $(window).on(`${Events.AJAX} ${Events.LOADED}`, () => {
+        $('form').jsFormStorage();
+    });
 
-    clear() {
-      STORAGE.clear();
-    }
-
-    static _jQueryInterface() {
-      if (typeof window.localStorage !== 'undefined') {
-        return this.each(function () {
-          // attach functionality to element
-          const $element = $(this);
-          let data = $element.data(DATA_KEY);
-
-          if (!data) {
-            data = new FormStorage(this);
-            $element.data(DATA_KEY, data);
-          }
-        });
-      }
-    }
-  }
-
-  // jQuery interface
-  $.fn[NAME] = FormStorage._jQueryInterface;
-  $.fn[NAME].Constructor = FormStorage;
-  $.fn[NAME].noConflict = function () {
-    $.fn[NAME] = JQUERY_NO_CONFLICT;
-    return FormStorage._jQueryInterface;
-  };
-
-  // auto-apply
-  $(window).on(`${Events.AJAX} ${Events.LOADED}`, () => {
-    $('form').jsFormStorage();
-  });
-
-  return FormStorage;
+    return FormStorage;
 })($);
 
 export default FormStorage;
diff --git a/app/client/src/js/main.js b/app/client/src/js/main.js
index eca03a6..b89e3f4 100644
--- a/app/client/src/js/main.js
+++ b/app/client/src/js/main.js
@@ -300,4 +300,4 @@ const MainUI = (($) => {
     return MainUI;
 })($);
 
-export default MainUI;
\ No newline at end of file
+export default MainUI;
diff --git a/app/client/src/scss/_bootstrap_variables.scss b/app/client/src/scss/_bootstrap_variables.scss
deleted file mode 100644
index cfbe4f3..0000000
--- a/app/client/src/scss/_bootstrap_variables.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-// bootstrap minify bugfix:
-$navbar-dark-toggler-icon-bg: none;
-$navbar-light-toggler-icon-bg: none;
-
-// IE > 9
-$enable-flex: true;
-
-@import "~bootstrap/scss/functions";
-@import "~bootstrap/scss/variables";
-@import "~bootstrap/scss/mixins";
\ No newline at end of file
diff --git a/app/client/src/scss/_layout.scss b/app/client/src/scss/_layout.scss
index 38a8a40..9722f34 100644
--- a/app/client/src/scss/_layout.scss
+++ b/app/client/src/scss/_layout.scss
@@ -1,14 +1,3 @@
 /**
  * Your custom style
  */
-
-@import "_components/ui.carousel";
-
-// hide default page title cuz elemental object will be used to display titles
-h1 {
-  display: none;
-}
-
-img {
-	max-width: 100%;
-}
diff --git a/app/client/src/scss/_typography.scss b/app/client/src/scss/_typography.scss
index 549bf46..359d8a6 100644
--- a/app/client/src/scss/_typography.scss
+++ b/app/client/src/scss/_typography.scss
@@ -1,5 +1,8 @@
-@import "./_variables";
+h1, h2, h3, h4, h5, h6,
+.h1, .h2, .h3, .h4, .h5, .h6 {
+    color: $dark-blue;
+}
 
 .typography {
     @import "./types/editor";
-}
\ No newline at end of file
+}
diff --git a/app/client/src/scss/_variables.scss b/app/client/src/scss/_variables.scss
index a66c035..4ce314c 100644
--- a/app/client/src/scss/_variables.scss
+++ b/app/client/src/scss/_variables.scss
@@ -1,5 +1,35 @@
-@import "_bootstrap_variables";
-
 /*
  * Your custom variables
- */
\ No newline at end of file
+ */
+
+$font-family-base: "Lato", sans-serif;
+
+$grid-gutter-height: 8rem;
+
+$gray-900: #212529;
+$white: #fff;
+$blue: #016cb1;
+$yellow: #ecac02;
+
+$dark-blue: #113362;
+
+$body-color: $gray-900;
+$navbar-light-active-color: $blue;
+
+$dropdown-border-color: $white;
+
+/*
+ * bootstrap includes
+ * keep it at the end
+ */
+
+// bootstrap minify bugfix:
+$navbar-dark-toggler-icon-bg: none;
+$navbar-light-toggler-icon-bg: none;
+
+// IE > 9
+$enable-flex: true;
+
+@import "~bootstrap/scss/functions";
+@import "~bootstrap/scss/variables";
+@import "~bootstrap/scss/mixins";
diff --git a/app/client/src/scss/app.scss b/app/client/src/scss/app.scss
index 787d798..68d9211 100644
--- a/app/client/src/scss/app.scss
+++ b/app/client/src/scss/app.scss
@@ -1,6 +1,7 @@
-// Bootstrap
-@import "_bootstrap_variables";
+// Your custom variables
+@import "_variables";
 
+// Bootstrap
 @import "~bootstrap/scss/root";
 @import "~bootstrap/scss/reboot";
 @import "~bootstrap/scss/type";
@@ -45,10 +46,87 @@ $lightbox-link-hover-color: $link-hover-color;
 
 @import "~meta-lightbox/scss/meta-lightbox";
 @import "~meta-lightbox/scss/meta-lightbox-theme";
+@import "_components/ui.carousel";
 
-// Your custom variables
-@import "_variables";
+/*
+ * some basic styles
+ */
+
+// hide default page title cuz elemental object will be used to display titles
+h1 {
+    display: none;
+}
+
+// don't let images be wider than the parent layer
+iframe,
+img {
+    max-width: 100%;
+}
+
+a:hover,
+a:focus {
+    opacity: .8;
+}
+
+// transactions
+.transition,
+a, a img,
+button, input, optgroup, select, textarea,
+.btn,
+.alert,
+.dropdown,
+[data-target],
+.container,
+.container-fluid,
+.row,
+[class="col-*"] {
+    transition: all 0.4s ease;
+}
+
+// stick navbar to top using mobile layout
+#Header {
+    position: relative;
+    padding-top: $grid-gutter-height / 2;
+    padding-bottom: 1rem;
+
+    @media (min-width: map-get($grid-breakpoints, "lg")) {
+        padding-top: 1rem;
+        padding-bottom: 0;
+    }
+}
+
+#Navigation {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+
+    @media (min-width: map-get($grid-breakpoints, "lg")) {
+        position: relative;
+        margin-top: 1rem;
+    }
+}
+
+// add top/bottom paddings for basic elements
+.page-content > .element {
+    position: relative;
+    padding: ($grid-gutter-height / 2) 0;
+
+    // remove paddings of the slideshow
+    &.dynamic__elements__image__elements__elementimage,
+    &.dynamic__elements__flexslider__elements__elementslideshow {
+        padding: 0;
+    }
+}
+
+// remove container paddings for the slideshow
+.dynamic__elements__image__elements__elementimage,
+.dynamic__elements__flexslider__elements__elementslideshow {
+    .container-fluid {
+        padding: 0;
+    }
+}
 
 // Your custom UI
 @import "_typography";
-@import "_layout";
\ No newline at end of file
+@import "_layout";
diff --git a/app/client/src/scss/types/editor.scss b/app/client/src/scss/types/editor.scss
index 2385ddd..5ccefe7 100644
--- a/app/client/src/scss/types/editor.scss
+++ b/app/client/src/scss/types/editor.scss
@@ -1 +1 @@
-@import "../_variables";
\ No newline at end of file
+@import "../_variables";
diff --git a/app/composer.json b/app/composer.json
new file mode 100644
index 0000000..b7bcacb
--- /dev/null
+++ b/app/composer.json
@@ -0,0 +1,11 @@
+{
+    "autoload": {
+        "psr-4": {
+            "Site\\": "app/src/"
+        },
+        "classmap": [
+            "app/src/Pages/Page.php",
+            "app/src/Pages/PageController.php"
+        ]
+    }
+}
diff --git a/app/src/Elements/TeamMembersElement.php b/app/src/Elements/TeamMembersElement.php
new file mode 100644
index 0000000..2befdfc
--- /dev/null
+++ b/app/src/Elements/TeamMembersElement.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: tony
+ * Date: 6/30/18
+ * Time: 11:54 PM
+ */
+
+namespace Site\Elements;
+use DNADesign\Elemental\Models\BaseElement;
+use Site\Models\TeamMember;
+
+class TeamMembersElement extends BaseElement
+{
+    private static $singular_name = 'Team Members';
+
+    private static $plural_name = 'Team Members';
+
+    private static $description = 'Displays random Team Members';
+
+    public function getType()
+    {
+        return self::$singular_name;
+    }
+
+    public function Members()
+    {
+        return TeamMember::get()->sort('RAND()');
+    }
+}
\ No newline at end of file
diff --git a/app/src/Extensions/BlogPostExtension.php b/app/src/Extensions/BlogPostExtension.php
new file mode 100644
index 0000000..79a1d8b
--- /dev/null
+++ b/app/src/Extensions/BlogPostExtension.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: tony
+ * Date: 7/2/18
+ * Time: 12:10 AM
+ */
+
+namespace Site\Extensions;
+
+use DNADesign\Elemental\Models\BaseElement;
+use DNADesign\Elemental\Models\ElementContent;
+use SilverStripe\ORM\DataExtension;
+
+class BlogPostExtension extends DataExtension
+{
+    /*
+     * Shows custom summary of the post, otherwise
+     * Displays summary of the first content element
+     */
+    public function Summary($wordsToDisplay = 30)
+    {
+        $summary = $this->owner->getField('Summary');
+        if($summary){
+            return $summary;
+        }
+
+        BaseElement::
+        $element = ElementContent::get()->filter([
+            'ParentID' => $this->owner->ElementalArea()->ID,
+            'HTML:not' => [null],
+        ])->first();
+
+        if($element){
+            return $element->dbObject('HTML')->Summary($wordsToDisplay);
+        }
+
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/app/src/Extensions/ElementContentWidget.php b/app/src/Extensions/ElementContentWidget.php
new file mode 100644
index 0000000..8687582
--- /dev/null
+++ b/app/src/Extensions/ElementContentWidget.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: tony
+ * Date: 6/24/18
+ * Time: 2:35 PM
+ */
+
+namespace Site\Extensions;
+
+
+use Sheadawson\Linkable\Forms\LinkField;
+use Sheadawson\Linkable\Models\Link;
+use SilverStripe\FontAwesome\FontAwesomeField;
+use SilverStripe\Forms\FieldList;
+use SilverStripe\ORM\DataExtension;
+
+class ElementContentWidget extends DataExtension
+{
+    private static $db = [
+        'BlockIcon' => 'Varchar(255)',
+    ];
+
+    private static $has_one = [
+        'BlockLink' => Link::class,
+    ];
+
+    public function updateCMSFields(FieldList $fields)
+    {
+        parent::updateCMSFields($fields);
+
+        $tab = $fields->findOrMakeTab('Root.Main');
+        $tab->push(
+            FontAwesomeField::create('BlockIcon')
+        );
+
+        $tab->push(
+            LinkField::create('BlockLinkID', 'Link')
+        );
+    }
+}
\ No newline at end of file
diff --git a/app/src/Extensions/ElementImageWidget.php b/app/src/Extensions/ElementImageWidget.php
new file mode 100644
index 0000000..c5162c4
--- /dev/null
+++ b/app/src/Extensions/ElementImageWidget.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: tony
+ * Date: 6/24/18
+ * Time: 1:46 AM
+ */
+
+namespace Site\Extensions;
+
+use Dynamic\Elements\Image\Elements\ElementImage;
+use Sheadawson\Linkable\Forms\LinkField;
+use Sheadawson\Linkable\Models\Link;
+use SilverStripe\Core\Config\Config;
+use SilverStripe\Forms\DropdownField;
+use SilverStripe\Forms\FieldList;
+use SilverStripe\ORM\DataExtension;
+
+class ElementImageWidget extends DataExtension
+{
+    private static $available_heights = [
+        '300' => 'Small (300px)',
+        '400' => 'Medium (400px)',
+        '600' => 'Big (600px)',
+    ];
+
+    private static $db = [
+        'ImageHeight' => 'Float',
+        'Content' => 'HTMLText',
+    ];
+
+    private static $has_one = [
+        'ImageLink' => Link::class,
+    ];
+
+    public function updateCMSFields(FieldList $fields)
+    {
+        parent::updateCMSFields($fields);
+
+        $fields->insertBefore(
+            'Image',
+            LinkField::create('ImageLinkID', 'Link')
+        );
+
+        $this->owner->ImageHeight = $this->getHeight();
+
+        $heights = Config::inst()->get(__CLASS__, 'available_heights');
+        if (count($heights)) {
+            $fields->replaceField(
+                'ImageHeight',
+                DropdownField::create(
+                    'ImageHeight',
+                    'Image Height',
+                    $heights,
+                    $this->getHeight()
+                )->setEmptyString('(unspecified)')
+            );
+        } else {
+            $fields->dataFieldByName('ImageHeight')
+                ->setValue($this->getHeight());
+        }
+    }
+
+    public function ImageResized()
+    {
+        $image = $this->owner->Image();
+        $width = $this->getWidth();
+        $height = $this->getHeight();
+
+        if (!$width) {
+            return $height > 0
+            ? $image->ScaleHeight($height)
+            : $image;
+        }
+
+        return $height > 0
+            ? $image->Fill($width, $height)
+            : $image->ScaleWidth($width);
+    }
+
+    public function getWidth()
+    {
+        $columnSize = $this->owner->getColumnSizeRecursive();
+        if (!$columnSize) {
+            return false;
+        }
+
+        $max = Config::inst()->get(ElementRows::class, 'container_max_width');
+        $size = 12 / $columnSize;
+
+        return $max / $size;
+    }
+
+    public function getHeight()
+    {
+        $height = $this->owner->getField('ImageHeight');
+        if ($height > 0) {
+            return $height;
+        }
+
+        $sibling = $this->owner->getSibling(false, [
+            'ImageHeight:GreaterThan' => '0'
+        ]);
+
+        if ($sibling && $sibling->getField('ImageHeight')) {
+            return $sibling->getField('ImageHeight');
+        }
+
+        return 0;
+    }
+}
diff --git a/app/src/Extensions/ElementRows.php b/app/src/Extensions/ElementRows.php
index 456247e..0f3a373 100644
--- a/app/src/Extensions/ElementRows.php
+++ b/app/src/Extensions/ElementRows.php
@@ -8,64 +8,82 @@
 
 namespace Site\Extensions;
 
-
 use DNADesign\ElementalList\Model\ElementList;
+use Dynamic\Elements\Image\Elements\ElementImage;
 use SilverStripe\Forms\DropdownField;
 use SilverStripe\ORM\DataExtension;
 use SilverStripe\Forms\FieldList;
-use SilverStripe\ORM\FieldType\DBEnum;
 
 class ElementRows extends DataExtension
 {
+    private static $container_max_width = 1140;
     private static $column_class = 'col-md-';
+
     private static $container_styles = [
-      'container' => 'Fixed container',
-      'container-fluid' => 'Fluid Container',
+        'container' => 'Fixed container',
+        'container-fluid' => 'Fluid Container',
     ];
 
     private static $db = [
-      'Size' => 'Enum("1,2,3,4,5,6,7,8,9,10,11,12","6")',
+        'ContainerType' => 'Varchar(254)',
+        'Size' => 'Enum("1,2,3,4,5,6,7,8,9,10,11,12","6")',
     ];
 
     public function updateCMSFields(FieldList $fields)
     {
+        parent::updateCMSFields($fields);
+
         $tab = $fields->findOrMakeTab('Root.Main');
 
-        if($this->isRoot() && $this->isList()) {
-            $styleDropdown = $fields->dataFieldByName('Style');
-            if ($styleDropdown) {
-                $styleDropdown->setSource(self::$container_styles);
-            } else {
-                $styleDropdown = DropdownField::create(
-                    'Style',
-                    _t(__CLASS__.'.STYLE', 'Style variation'),
-                    self::$container_styles
-                );
-                $fields->insertBefore($styleDropdown, 'ExtraClass');
-            }
+        // container type
+        if ($this->isRoot()) {
+            $tab->push(DropdownField::create(
+                'ContainerType',
+                _t(__CLASS__.'.CONTAINERTYPE', 'Container Type'),
+                self::$container_styles
+            ));
+        } else {
+            $fields->removeByName('ContainerType');
         }
 
-        if($this->isColumn()) {
+        // column size
+        if ($this->isColumn()) {
             $sizes = $this->owner->dbObject('Size');
             $defaultSize = $sizes->getDefaultValue();
 
             $sizeDropdown = DropdownField::create(
                 'Size',
-                'Column Size (12 cols grid, ex. for 3 equal cols: 12/3 = 4 is the size that you need)',
-                $sizes->enumValues()
+                _t(
+                    __CLASS__.'.SIZE',
+                    'Column Size'
+                ),
+                array_combine(
+                    array_values($sizes->enumValues()),
+                    [
+                        '8.3%',
+                        '16.6%',
+                        '25%',
+                        '33%',
+                        '41.6%',
+                        '50%',
+                        '58.3%',
+                        '66.4%',
+                        '74.7%',
+                        '83%',
+                        '91.3%',
+                        '100%',
+                    ]
+                )
             );
             $tab->push($sizeDropdown);
 
             // set default size
-            if(!$this->owner->getField('Size')){
-                $sibling = $this->owner->Parent()
-                    ->Elements()
-                    ->exclude('ID', $this->owner->ID)
-                    ->last();
+            if (!$this->owner->getField('Size')) {
+                $sibling = $this->getSibling();
 
                 $sizeDropdown->setValue($sibling ? $sibling->getField('Size') : $defaultSize);
             }
-        }else{
+        } else {
             $fields->removeByName('Size');
         }
     }
@@ -77,7 +95,7 @@ class ElementRows extends DataExtension
 
     public function isRow()
     {
-        if(!$this->isList()){
+        if (!$this->isList()) {
             return false;
         }
 
@@ -86,7 +104,7 @@ class ElementRows extends DataExtension
 
     public function isColumn()
     {
-        if(!$this->isRoot() && !$this->isRow()){
+        if (!$this->isRoot()) {
             return true;
         }
 
@@ -96,35 +114,66 @@ class ElementRows extends DataExtension
     public function isRoot()
     {
         $parent = $this->owner->Parent()->getOwnerPage();
-        if(is_a($parent, 'Page')){
+        if (is_a($parent, 'Page')) {
             return true;
         }
 
         return false;
     }
 
+    public function getSibling($any = true, $filter = [], $exclude = [])
+    {
+        $class = $any ? $this->owner->baseClass() : $this->owner->ClassName;
+
+        return $class::get()->filter(array_merge(
+            ['ParentID' => $this->owner->Parent()->ID],
+            $filter
+        ))->exclude(array_merge(
+            ['ID' => $this->owner->ID],
+            $exclude
+        ))->last();
+    }
+
+    public function getColumnSizeRecursive($object = null)
+    {
+        $object = $object ? $object : $this->owner;
+
+        if ($object->isColumn() && $object->getField('Size')) {
+            return (int) $object->getField('Size');
+        } else {
+            $parent = $object->Parent()->getOwnerPage();
+
+            if (is_a($parent, 'Page')) {
+                return ($this->owner->getField('ContainerType') === 'container-fluid') ? false : 12;
+            }
+
+            return $object->getColumnSizeRecursive($parent);
+        }
+    }
+
     public function ExtraClass()
     {
-        return $this->isColumn()
-            ? self::$column_class.$this->owner->getField('Size')
-            : '';
+        return $this->owner->getField('ExtraClass')
+            .(
+                $this->isColumn()
+                ? ' col '.self::$column_class.$this->owner->getField('Size')
+                : ''
+            );
     }
 
     /*
      * if it's root element and it doesn't contain any container styles
      * add the first one
      */
-    public function updateStyleVariant(&$style)
+    public function ContainerClass()
     {
-        $style = $this->owner->getField('Style');
+        $type = $this->owner->getField('ContainerType');
         $container_styles = array_keys(self::$container_styles);
 
-        if(
-            $this->isRoot()
-            && $this->isList()
-            && !in_array($style, $container_styles)
-        ){
-            $style = $container_styles[0];
+        if (!$type && $this->isRoot()) {
+            $type = $container_styles[0];
         }
+
+        return $type;
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/Extensions/HiddenType.php b/app/src/Extensions/HiddenType.php
new file mode 100644
index 0000000..96f6100
--- /dev/null
+++ b/app/src/Extensions/HiddenType.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: tony
+ * Date: 7/2/18
+ * Time: 1:05 AM
+ */
+
+namespace Site\Extensions;
+
+use SilverStripe\ORM\HiddenClass;
+use Page;
+
+class CMSMain_HiddenClass extends Page implements HiddenClass
+{
+
+}
\ No newline at end of file
diff --git a/app/src/Extensions/SiteConfigExtension.php b/app/src/Extensions/SiteConfigExtension.php
index 6e13379..71e26ff 100644
--- a/app/src/Extensions/SiteConfigExtension.php
+++ b/app/src/Extensions/SiteConfigExtension.php
@@ -2,26 +2,23 @@
 
 namespace Site\Extensions;
 
+use SilverStripe\Forms\TextareaField;
 use SilverStripe\ORM\DataExtension;
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\TreeMultiselectField;
-use Sheadawson\Linkable\Models\Link;
-use SilverStripe\Forms\TextField;
-use Sheadawson\Linkable\Forms\LinkField;
 
 class SiteConfigExtension extends DataExtension
 {
     private static $db = [
-        'Address' => 'Varchar(255)',
-    ];
-
-    private static $has_one = [
-        'PhoneNumber' => Link::class
+        'ShortDescription' => 'Text',
+        'ExtraCode' => 'Text',
     ];
 
     private static $many_many = [
-        'Navigation' => SiteTree::class
+        'Navigation' => SiteTree::class,
+        'Services' => SiteTree::class,
+        'QuickLinks' => SiteTree::class,
     ];
 
     public function updateCMSFields(FieldList $fields)
@@ -33,10 +30,20 @@ class SiteConfigExtension extends DataExtension
             'Navigation',
             SiteTree::class
         ));
-        $tab->push(
-            LinkField::create('PhoneNumberID', 'Phone Number')
-                ->setAllowedTypes(['Phone'])
-        );
-        $tab->push(TextField::create('Address'));
+
+        $tab->push(TreeMultiselectField::create(
+            'Services',
+            'Services',
+            SiteTree::class
+        ));
+        $tab->push(TreeMultiselectField::create(
+            'QuickLinks',
+            'QuickLinks',
+            SiteTree::class
+        ));
+
+        $tab->push(TextareaField::create('ShortDescription'));
+
+        $tab->push(TextareaField::create('ExtraCode', 'Extra site-wide HTML code'));
     }
 }
diff --git a/app/src/Extensions/SiteTreeExtension.php b/app/src/Extensions/SiteTreeExtension.php
new file mode 100644
index 0000000..a571b3a
--- /dev/null
+++ b/app/src/Extensions/SiteTreeExtension.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Site\Extensions;
+
+use SilverStripe\ORM\DataExtension;
+use SilverStripe\CMS\Model\SiteTree;
+use SilverStripe\Forms\FieldList;
+use SilverStripe\Forms\TreeMultiselectField;
+use Sheadawson\Linkable\Models\Link;
+use SilverStripe\Forms\TextField;
+use Sheadawson\Linkable\Forms\LinkField;
+
+class SiteTreeExtension extends DataExtension
+{
+    private static $db = [
+        'ExtraCode' => 'Text',
+    ];
+
+    public function updateCMSFields(FieldList $fields)
+    {
+        $tab = $fields->findOrMakeTab('Root.Settings');
+
+        $tab->push(Textarea::create(
+            'ExtraCode',
+            'Extra page specific HTML code'
+        ));
+    }
+}
diff --git a/app/src/Extensions/SocialExtension.php b/app/src/Extensions/SocialExtension.php
new file mode 100644
index 0000000..c7d212b
--- /dev/null
+++ b/app/src/Extensions/SocialExtension.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: tony
+ * Date: 6/30/18
+ * Time: 11:37 PM
+ */
+
+namespace Site\Extensions;
+
+
+use Sheadawson\Linkable\Forms\LinkField;
+use Sheadawson\Linkable\Models\Link;
+use SilverStripe\Forms\FieldList;
+use SilverStripe\Forms\TextField;
+use SilverStripe\ORM\DataExtension;
+use SilverStripe\UserForms\Model\UserDefinedForm;
+
+class SocialExtension extends DataExtension
+{
+    private static $db = [
+        'Address' => 'Varchar(255)',
+    ];
+
+    private static $has_one = [
+        'Facebook' => Link::class,
+        'LinkedIn' => Link::class,
+        'GooglePlus' => Link::class,
+        'Instagram' => Link::class,
+        'Twitter' => Link::class,
+        'PublicEmail' => Link::class,
+        'PhoneNumber' => Link::class,
+    ];
+
+    public function updateCMSFields(FieldList $fields)
+    {
+        parent::updateCMSFields($fields);
+
+        $linkFields = [
+            LinkField::create('FacebookID'),
+            LinkField::create('LinkedInID'),
+            LinkField::create('GooglePlusID'),
+            LinkField::create('InstagramID'),
+            LinkField::create('TwitterID'),
+        ];
+
+        foreach ($linkFields as $field) {
+            $field->setAllowedTypes(['URL']);
+        }
+
+        $fields->findOrMakeTab('Root.Social');
+UserDefinedForm::
+        $fields->addFieldsToTab('Root.Social', [
+            LinkField::create('PublicEmailID', 'Public Email')
+                ->setAllowedTypes(['Email']),
+            LinkField::create('PhoneNumberID', 'Phone Number')
+                ->setAllowedTypes(['Phone']),
+            TextField::create('Address'),
+        ]);
+
+        $fields->addFieldsToTab('Root.Social', $linkFields);
+    }
+}
\ No newline at end of file
diff --git a/app/src/Models/TeamMember.php b/app/src/Models/TeamMember.php
new file mode 100644
index 0000000..489f385
--- /dev/null
+++ b/app/src/Models/TeamMember.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: tony
+ * Date: 6/30/18
+ * Time: 11:36 PM
+ */
+
+namespace Site\Models;
+
+
+use SilverStripe\Assets\Image;
+use SilverStripe\ORM\DataObject;
+use SilverStripe\Versioned\Versioned;
+use Site\Extensions\SocialExtension;
+use Site\Pages\TeamPage;
+
+class TeamMember extends DataObject
+{
+    private static $table_name = 'TeamMember';
+
+    private static $db = [
+        'FirstName' => 'Varchar(254)',
+        'LastName' => 'Varchar(254)',
+        'Company' => 'Varchar(254)',
+        'Position' => 'Varchar(254)',
+    ];
+
+    private static $has_one = [
+        'Photo' => Image::class,
+        'Page' => TeamPage::class,
+    ];
+
+    private static $extensions = [
+        SocialExtension::class,
+        Versioned::class,
+    ];
+
+    private static $owns = [
+        'Photo',
+    ];
+
+    private static $summary_fields = [
+        'Company',
+        'FirstName',
+        'LastName',
+        'Position',
+    ];
+
+    public function getTitle()
+    {
+        return $this->getField('Company').' | '.$this->getField('FirstName').' '.$this->getField('LastName');
+    }
+}
\ No newline at end of file
diff --git a/app/src/Pages/HomePage.php b/app/src/Pages/HomePage.php
index 5d334bd..f7f85b2 100644
--- a/app/src/Pages/HomePage.php
+++ b/app/src/Pages/HomePage.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Site\Pages;
+
 use Page;
 
 class HomePage extends Page
diff --git a/app/src/Pages/HomePageController.php b/app/src/Pages/HomePageController.php
index f1735bd..12e1b15 100644
--- a/app/src/Pages/HomePageController.php
+++ b/app/src/Pages/HomePageController.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Site\Pages;
+
 use PageController;
 
 class HomePageController extends PageController
diff --git a/app/src/Pages/PageController.php b/app/src/Pages/PageController.php
index fe89680..163ffe1 100644
--- a/app/src/Pages/PageController.php
+++ b/app/src/Pages/PageController.php
@@ -5,7 +5,12 @@
 //namespace Site\Pages;
 
 use SilverStripe\CMS\Controllers\ContentController;
+use SilverStripe\ORM\FieldType\DBDatetime;
 
 class PageController extends ContentController
 {
+    public function CurrentTime()
+    {
+        return DBDatetime::now();
+    }
 }
diff --git a/app/src/Pages/TeamPage.php b/app/src/Pages/TeamPage.php
new file mode 100644
index 0000000..6ce4ecd
--- /dev/null
+++ b/app/src/Pages/TeamPage.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: tony
+ * Date: 6/30/18
+ * Time: 11:46 PM
+ */
+
+namespace Site\Pages;
+
+
+use SilverStripe\Forms\GridField\GridField;
+use SilverStripe\Forms\GridField\GridFieldConfig_RecordEditor;
+use Site\Models\TeamMember;
+
+class TeamPage extends \Page
+{
+    private static $has_many = [
+        'Members' => TeamMember::class,
+    ];
+
+    private static $owns = [
+        'Members',
+    ];
+
+    public function getCMSFields()
+    {
+        $fields = parent::getCMSFields();
+
+        $fields->addFieldToTab(
+            'Root.Members',
+            GridField::create(
+                'Members',
+                '',
+                $this->Members(),
+                GridFieldConfig_RecordEditor::create()
+            )
+        );
+
+        return $fields;
+    }
+}
\ No newline at end of file
diff --git a/app/src/Pages/TeamPageController.php b/app/src/Pages/TeamPageController.php
new file mode 100644
index 0000000..e610518
--- /dev/null
+++ b/app/src/Pages/TeamPageController.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: tony
+ * Date: 6/30/18
+ * Time: 11:49 PM
+ */
+
+namespace Site\Pages;
+
+
+class TeamPageController extends \PageController
+{
+
+}
\ No newline at end of file
diff --git a/app/templates/DNADesign/Elemental/Layout/ElementHolder.ss b/app/templates/DNADesign/Elemental/Layout/ElementHolder.ss
new file mode 100644
index 0000000..46dc805
--- /dev/null
+++ b/app/templates/DNADesign/Elemental/Layout/ElementHolder.ss
@@ -0,0 +1,5 @@
+<div class="element $SimpleClassName.LowerCase<% if $StyleVariant %> $StyleVariant<% end_if %><% if $ExtraClass %> $ExtraClass<% end_if %>" id="$Anchor">
+	<div class="element-container<% if $ContainerClass %> $ContainerClass<% end_if %>">
+		$Element
+	</div>
+</div>
diff --git a/app/templates/DNADesign/Elemental/Models/ElementContent.ss b/app/templates/DNADesign/Elemental/Models/ElementContent.ss
new file mode 100644
index 0000000..2ecdd9a
--- /dev/null
+++ b/app/templates/DNADesign/Elemental/Models/ElementContent.ss
@@ -0,0 +1,18 @@
+<div class="content-element__content <% if $Style %>$CssStyle<% end_if %>">
+    <% if $BlockIcon %>
+        <i class="content-element__icon $BlockIcon"></i>
+    <% end_if %>
+	<% if $ShowTitle %>
+        <h2 class="content-element__title">$Title</h2>
+    <% end_if %>
+
+    <div class="typography">
+        $HTML
+    </div>
+
+    <% if $BlockLink %>
+        <a href="$BlockLink.URL" class="btn btn-default">
+            $BlockLink.Title
+        </a>
+    <% end_if %>
+</div>
diff --git a/app/templates/DNADesign/ElementalUserForms/Model/ElementForm.ss b/app/templates/DNADesign/ElementalUserForms/Model/ElementForm.ss
new file mode 100644
index 0000000..7b0d5b3
--- /dev/null
+++ b/app/templates/DNADesign/ElementalUserForms/Model/ElementForm.ss
@@ -0,0 +1,10 @@
+<div class="form-element__form $ExtraClass">
+    <div class="row">
+        <div class="col-md-6">
+            <% if $Title && $ShowTitle %>
+                <h2 class="form-element__title">$Title</h2>
+            <% end_if %>
+            $Form
+        </div>
+    </div>
+</div>
diff --git a/app/templates/Dynamic/Elements/Blog/Elements/ElementBlogPosts.ss b/app/templates/Dynamic/Elements/Blog/Elements/ElementBlogPosts.ss
new file mode 100644
index 0000000..f940aa8
--- /dev/null
+++ b/app/templates/Dynamic/Elements/Blog/Elements/ElementBlogPosts.ss
@@ -0,0 +1,14 @@
+<% if $Title && $ShowTitle %><h2 class="element__title text-center">$Title</h2><% end_if %>
+<% if $Content %><div class="element__content">$Content</div><% end_if %>
+
+<% if $PostsList %>
+    <div class="row">
+    <% loop $PostsList %>
+        <div class="col-sm-4">
+            <% include BlogPostInfo %>
+        </div>
+    <% end_loop %>
+    </div>
+    <%-- p><a href="$Blog.Link" class="btn btn-primary" title="Go to the $Title page">View all posts</a></p --%>
+<% end_if %>
+
diff --git a/app/templates/Dynamic/Elements/Elements/ElementTestimonials.ss b/app/templates/Dynamic/Elements/Elements/ElementTestimonials.ss
new file mode 100644
index 0000000..d043b32
--- /dev/null
+++ b/app/templates/Dynamic/Elements/Elements/ElementTestimonials.ss
@@ -0,0 +1,14 @@
+<% if $Title && $ShowTitle %><h2 class="element__title text-center">$Title</h2><% end_if %>
+<% if $Content %><div class="element__content">$Content</div><% end_if %>
+
+<% if $TestimonialsList %>
+    <div class="row">
+    <% loop $TestimonialsList %>
+        <% if $Content || $Name || $Affiliation %>
+        <div class="col-sm-6">
+            <% include Objects\Testimonial %>
+        </div>
+        <% end_if %>
+    <% end_loop %>
+    </div>
+<% end_if %>
\ No newline at end of file
diff --git a/app/templates/Dynamic/Elements/Image/Elements/ElementImage.ss b/app/templates/Dynamic/Elements/Image/Elements/ElementImage.ss
index 3671843..60a9b9a 100644
--- a/app/templates/Dynamic/Elements/Image/Elements/ElementImage.ss
+++ b/app/templates/Dynamic/Elements/Image/Elements/ElementImage.ss
@@ -1,4 +1,24 @@
-<% if $ShowTitle %><h3>$Title</h3><% end_if %>
-<% if $Image %>
-    <img src="$Image.URL" class="img-responsive" alt="$Title.ATT">
+<% if $ImageResized %>
+    <div class="image-element__image<% if $Height %> height{$Height}<% end_if %><% if $Width %> width{$Width}<% end_if %>">
+        <% if $ImageLink %><a href="$ImageLink.URL"><% end_if %>
+        <img src="$ImageResized.URL" class="img-responsive" alt="$Title.ATT">
+        <% if $ImageLink %></a><% end_if %>
+    </div>
 <% end_if %>
+
+<div class="image-element__caption img-content">
+    <div class="container">
+        <% if $ShowTitle %><h3 class="image-element__title title">$Title</h3><% end_if %>
+
+        <% if $Content %>
+            <div class="image-element__content typography">$Content</div>
+        <% end_if %>
+
+        <% if $ImageLink %>
+            <a href="$ImageLink.URL" class="image-element__btn btn btn-default">
+                $ImageLink.Title
+                <i class="fas fa-caret-right"></i>
+            </a>
+        <% end_if %>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/templates/Includes/BlogPostInfo.ss b/app/templates/Includes/BlogPostInfo.ss
new file mode 100644
index 0000000..1e00a80
--- /dev/null
+++ b/app/templates/Includes/BlogPostInfo.ss
@@ -0,0 +1,25 @@
+<div class="blog-post-info">
+    <div class="published-date">
+        <div class="day">$PublishDate.Format("d")</div>
+        <div class="month">$PublishDate.Format("MMM")</div>
+    </div>
+    <% if $FeaturedImage %>
+        <div class="img">
+            <a href="$Link">$FeaturedImage.Fill(350,200)</a>
+        </div>
+    <% end_if %>
+
+    <% include SilverStripe\\Blog\\EntryMeta %>
+
+    <h5 class="title">
+        <a href="$Link.ATT" title="Go to the $Title post">
+            $Title
+        </a>
+    </h5>
+
+    <div class="typography summary">
+        $Summary
+    </div>
+
+    <a href="{$Link}" class="btn btn-link">Read More &raquo;</a>
+</div>
\ No newline at end of file
diff --git a/app/templates/Includes/Content.ss b/app/templates/Includes/Content.ss
index 375aec4..b855e20 100644
--- a/app/templates/Includes/Content.ss
+++ b/app/templates/Includes/Content.ss
@@ -9,6 +9,12 @@
             $Form
         </div>
         <% end_if %>
+
+        <% if $ExtraCode %>
+        <div class="extra-code extra-code-page">
+            $ExtraCode
+        </div>
+        <% end_if %>
 	</div>
-	
-</div>
\ No newline at end of file
+
+</div>
diff --git a/app/templates/Includes/FlexSlider.ss b/app/templates/Includes/FlexSlider.ss
index 107a3be..35b02a3 100644
--- a/app/templates/Includes/FlexSlider.ss
+++ b/app/templates/Includes/FlexSlider.ss
@@ -3,22 +3,24 @@
         <div class="carousel-inner">
             <% loop $SlideShow %>
             <div class="carousel-item<% if $First %> active<% end_if %>">
-                <% if $PageLink %><a href="$PageLink.Link" title="$PageLink.MenuTitle.XML"><% end_if %>
+                <% if $PageLink %><a href="$PageLink.Link" title="$PageLink.MenuTitle.XML" class="btn-primary"><% end_if %>
                 <% if $Image %>
                     <img class="d-block w-100" src="$Image.Fill(1200,600).URL" alt="<% if $Headline %>$Headline<% end_if %>">
                 <% end_if %>
                 <% if $PageLink %></a><% end_if %>
 
-                <div class="carousel-caption d-none d-md-block">
-                    <% if $Headline %><h2 class="carousel-title">$Headline</h2><% end_if %>
-                    <% if $Description %><p class="carousel-content">$Description</p><% end_if %>
-                    <% if $PageLinkID %>
-                        <p>
-                            <a href="$PageLink.Link" title="$PageLink.MenuTitle.XML" class="btn btn-default">
-                                <%t Dynamic\FlexSlider\ORM\FlexSlider.LEARN_MORE "Learn more" %>
-                            </a>
-                        </p>
-                    <% end_if %>
+                <div class="carousel-caption">
+                    <div class="carousel-caption-container">
+                        <% if $Headline %><h2 class="carousel-title">$Headline</h2><% end_if %>
+                        <% if $Description %><p class="carousel-content">$Description</p><% end_if %>
+                        <% if $PageLinkID %>
+                            <p>
+                                <a href="$PageLink.Link" title="$PageLink.MenuTitle.XML" class="btn btn-default">
+                                    <%t Dynamic\FlexSlider\ORM\FlexSlider.LEARN_MORE "Learn more" %>
+                                </a>
+                            </p>
+                        <% end_if %>
+                    </div>
                 </div>
             </div>
             <% end_loop %>
diff --git a/app/templates/Includes/Footer.ss b/app/templates/Includes/Footer.ss
new file mode 100644
index 0000000..aeb814a
--- /dev/null
+++ b/app/templates/Includes/Footer.ss
@@ -0,0 +1,65 @@
+<% with $SiteConfig %>
+<div class="container">
+    <div class="row">
+        <div class="col-md-4">
+            <div class="col">
+                <h2>About Us</h2>
+                <div class="typography short-description">
+                    $ShortDescription
+                </div>
+            </div>
+        </div>
+        <div class="col-md-2">
+            <div class="col">
+                <h2>Services</h2>
+                <ul class="links">
+                    <% loop $Services %>
+                        <li>
+                            <a href="{$Link}">$Title</a>
+                        </li>
+                    <% end_loop %>
+                </ul>
+            </div>
+        </div>
+        <div class="col-md-2">
+            <div class="col">
+                <h2>Quick Links</h2>
+                <ul class="links">
+                <% loop $QuickLinks %>
+                    <li>
+                        <a href="{$Link}">$Title</a>
+                    </li>
+                <% end_loop %>
+                </ul>
+            </div>
+        </div>
+        <div class="col-md-4">
+            <div class="col">
+                <h2>Contact Us</h2>
+                <div class="field row">
+                    <div class="title col-sm-4">Address:</div>
+                    <div class="value col-sm-8">$Address</div>
+                </div>
+
+                <div class="field row">
+                    <div class="title col-sm-4">Phone:</div>
+                    <div class="value col-sm-8">$PhoneNumber</div>
+                </div>
+
+                <div class="field row">
+                    <div class="title col-sm-4">Email:</div>
+                    <div class="value col-sm-8">$PublicEmail</div>
+                </div>
+
+                <% include Objects\SocialLinks %>
+            </div>
+        </div>
+    </div>
+</div>
+<% end_with %>
+
+<div class="copyright">
+    <div class="container">
+        Copyright &copy; {$CurrentTime.Format("Y")} All rights reserved.
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/templates/Includes/Header.ss b/app/templates/Includes/Header.ss
new file mode 100644
index 0000000..a6831f4
--- /dev/null
+++ b/app/templates/Includes/Header.ss
@@ -0,0 +1,26 @@
+<div class="row">
+    <div class="col-sm-6">
+        <a id="Logo" href="/"><img src="/resources/app/client/dist/img/logo.png" alt="{$SiteConfig.Title}" /></a>
+    </div>
+    <div class="col-sm-6 text-right">
+        <% with $SiteConfig %>
+            <% if $PhoneNumber %>
+                <span class="phone-number">
+                    $PhoneNumber
+                </span>
+            <% end_if %>
+            <% if $PublicEmail %>
+                <span class="public-email">
+                    $PublicEmail
+                </span>
+            <% end_if %>
+        <% end_with %>
+        <%-- if $SearchForm %>
+            <div id="SearchFormContainer">$SearchForm</div>
+        <% end_if --%>
+    </div>
+</div>
+
+<% if $SiteConfig.Navigation %>
+    <% include Navigation Navigation=$SiteConfig.Navigation, NavID="Navigation" %>
+<% end_if %>
\ No newline at end of file
diff --git a/app/templates/Includes/Head.ss b/app/templates/Includes/MetaHead.ss
similarity index 100%
rename from app/templates/Includes/Head.ss
rename to app/templates/Includes/MetaHead.ss
diff --git a/app/templates/Includes/NavItem.ss b/app/templates/Includes/NavItem.ss
index d10c730..6899a43 100644
--- a/app/templates/Includes/NavItem.ss
+++ b/app/templates/Includes/NavItem.ss
@@ -1,5 +1,5 @@
 <% if $Children %>
-    <li class="nav-item dropdown $ExtraClass <% if $isCurrent || $isSection %> active<% end_if %>">
+    <li class="nav-item dropdown<% if $isCurrent || $isSection %> active <% end_if %>{$ExtraClass}">
         <a
                 class="nav-link dropdown-toggle"
                 id="NavItem{$ID}"
@@ -27,4 +27,4 @@
             <% if $isCurrent || $isSection %><i class="sr-only">(current)</i><% end_if %>
         </a>
     </li>
-<% end_if %>
\ No newline at end of file
+<% end_if %>
diff --git a/app/templates/Includes/Navigation.ss b/app/templates/Includes/Navigation.ss
index 4babbb2..a1e8a18 100644
--- a/app/templates/Includes/Navigation.ss
+++ b/app/templates/Includes/Navigation.ss
@@ -1,21 +1,21 @@
-<nav class="navbar navbar-expand-lg navbar-light bg-light">
+<nav id="{$NavID}" class="navbar navbar-expand-lg navbar-light bg-light">
     <button
             class="navbar-toggler"
             type="button"
             data-toggle="collapse"
-            data-target="#navbarSupportedContent"
-            aria-controls="navbarSupportedContent"
+            data-target="#{$NavID}Content"
+            aria-controls="{$NavID}Content"
             aria-expanded="false"
             aria-label="Toggle navigation"
     >
-        <i class="navbar-toggler-icon"></i>
+        <i class="fas fa-bars"></i>
     </button>
 
-    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+    <div class="collapse navbar-collapse" id="{$NavID}Content">
         <ul class="navbar-nav mr-auto">
             <% loop $Navigation %>
                 <% include NavItem %>
             <% end_loop %>
         </ul>
     </div>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/app/templates/Objects/HCard.ss b/app/templates/Objects/HCard.ss
new file mode 100644
index 0000000..9bce657
--- /dev/null
+++ b/app/templates/Objects/HCard.ss
@@ -0,0 +1,33 @@
+<div class="vcard h-card">
+    <div class="img">
+        <img
+                class="photo u-photo"
+                src="<% if $Photo %>{$Photo.Fill(300,300).Link}<% else %>https://placehold.it/300x300<% end_if %>"
+                alt="{$Title}"
+        />
+        <div class="caption">
+            <% include Objects\SocialLinks %>
+        </div>
+    </div>
+
+    <h5 class="fn p-name">
+        $FirstName
+        $LastName
+    </h5>
+
+    <% if $Company || $Position %>
+    <div class="company">
+        <% if $Company %>
+            <span class="org p-org">$Company</span><% if $Position %>,<% end_if %>
+        <% end_if %>
+        <% if $Position %>
+            <span class="category p-category">$Position</span>
+        <% end_if %>
+    </div>
+    <% end_if %>
+
+    <span class="n p-name d-none">
+        <span class="given-name p-given-name">$FirstName</span>
+        <span class="family-name p-family-name">$LastName</span>
+    </span>
+</div>
\ No newline at end of file
diff --git a/app/templates/Objects/SocialLinks.ss b/app/templates/Objects/SocialLinks.ss
new file mode 100644
index 0000000..359e9c3
--- /dev/null
+++ b/app/templates/Objects/SocialLinks.ss
@@ -0,0 +1,32 @@
+<div class="sc-links">
+    <% if $Facebook %>
+        <a href="$Facebook.URL" title="Facebook" target="_blank">
+            <i class="fab fa-facebook"></i>
+            <i class="d-none">Facebook</i>
+        </a>
+    <% end_if %>
+    <% if $LinkedIn %>
+        <a href="$LinkedIn.URL" title="LinkedIn" target="_blank">
+            <i class="fab fa-linkedin"></i>
+            <i class="d-none">LinkedIn</i>
+        </a>
+    <% end_if %>
+    <% if $GooglePlus %>
+        <a href="$GooglePlus.URL" title="Google+" target="_blank">
+            <i class="fab fa-google-plus-official"></i>
+            <i class="d-none">Google+</i>
+        </a>
+    <% end_if %>
+    <% if $Instagram %>
+        <a href="$Instagram.URL" title="Instagram" target="_blank">
+            <i class="fab fa-instagram"></i>
+            <i class="d-none">Instagram</i>
+        </a>
+    <% end_if %>
+    <% if $Twitter %>
+        <a href="$Twitter.URL" title="Twitter" target="_blank">
+            <i class="fab fa-twitter"></i>
+            <i class="d-none">Twitter</i>
+        </a>
+    <% end_if %>
+</div>
\ No newline at end of file
diff --git a/app/templates/Objects/Testimonial.ss b/app/templates/Objects/Testimonial.ss
new file mode 100644
index 0000000..4c3cd3c
--- /dev/null
+++ b/app/templates/Objects/Testimonial.ss
@@ -0,0 +1,16 @@
+<div class="testimonial">
+    <div class="testimonial__quote">
+        <blockquote class="blockquote text-center">
+            <i class="fas fa-quote-left"></i>
+            <% if $Content %><p>$Content</p><% end_if %>
+            <% if $Name || $Affiliation %>
+                <footer class="blockquote-footer">
+                    <% if $Name %><div class="fn">$Name</div><% end_if %>
+                    <% if $Affiliation || $Position %>
+                        <div class="company">$Affiliation<% if $Position && $Affiliation %>, $Position<% else %>$Position<% end_if %></div>
+                    <% end_if %>
+                </footer>
+            <% end_if %>
+        </blockquote>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/templates/Page.ss b/app/templates/Page.ss
index c66f15a..67d23ce 100644
--- a/app/templates/Page.ss
+++ b/app/templates/Page.ss
@@ -2,7 +2,7 @@
 <html lang="$ContentLocale.ATT" dir="$i18nScriptDirection.ATT">
 <%--  manifest="/cache.appcache" --%>
 <head>
-    <% include Head %>
+    <% include MetaHead %>
 </head>
 
 <body oncontextmenu="return false;">
@@ -15,36 +15,18 @@
 	<%-- Loading Spinner --%>
 	<div id="PageLoading"><div class="loading-spinner"><div class="bubblingG"><i id="bubblingG_1"></i><i id="bubblingG_2"></i><i id="bubblingG_3"></i></div><br/><%t Page.LOADINGTEXT 'LOADING ..' %></div></div>
 
-    <header class="container">
-        <div class="row">
-            <div class="col-sm-6">
-                <a href="/"><img src="/resources/app/client/dist/img/logo.png" alt="{$SiteConfig.Title}" /></a>
-            </div>
-            <div class="col-sm-6 text-right">
-                <% with $SiteConfig %>
-                    <% if $PhoneNumber %>
-                        <div class="phone-number">
-                            <b>Call us today:</b>
-                            $PhoneNumber
-                        </div>
-                    <% end_if %>
-                <% end_with %>
-                <% if $SearchForm %>
-                    <div id="SearchFormContainer">$SearchForm</div>
-                <% end_if %>
-            </div>
-        </div>
+    <div class="wrapper">
+        <header id="Header" class="container">
+            <% include Header %>
+        </header>
 
-        <% include Navigation Navigation=$SiteConfig.Navigation %>
-
-    </header>
-
-    <main data-ajax-region="LayoutAjax">
-        $Layout
-    </main>
-
-    <footer>
+        <main id="MainContent" data-ajax-region="LayoutAjax">
+            $Layout
+        </main>
+    </div>
 
+    <footer id="Footer" class="site-footer">
+        <% include Footer %>
     </footer>
 
     <div class="hidden-print">
@@ -55,5 +37,8 @@
 	$AutoRequirements($ClassName).RAW
 
 	<%-- place extra requirements after this line --%>
+    <div class="extra-code extra-code-site">
+        $SiteConfig.ExtraCode
+    </div>
 </body>
 </html>
diff --git a/app/templates/Sheadawson/Linkable/Models/Link.ss b/app/templates/Sheadawson/Linkable/Models/Link.ss
new file mode 100644
index 0000000..0cdfe27
--- /dev/null
+++ b/app/templates/Sheadawson/Linkable/Models/Link.ss
@@ -0,0 +1,10 @@
+<% if $LinkURL %>
+    <a href="$LinkURL"{$TargetAttr}$ClassAttr  title="Go to $Title">
+        <% if $Type == 'Phone' %>
+            <i class="fas fa-phone"></i>
+        <% else_if $Type == 'Email' %>
+            <i class="fas fa-envelope-open"></i>
+        <% end_if %>
+        $Title
+    </a>
+<% end_if %>
\ No newline at end of file
diff --git a/app/templates/Sheadawson/Linkable/Models/Link_button.ss b/app/templates/Sheadawson/Linkable/Models/Link_button.ss
new file mode 100644
index 0000000..0367cc9
--- /dev/null
+++ b/app/templates/Sheadawson/Linkable/Models/Link_button.ss
@@ -0,0 +1,3 @@
+<% if $LinkURL %>
+    <a href="$LinkURL"{$TargetAttr}$ClassAttr class="btn btn-primary" title="Go to $Title">$Title</a>
+<% end_if %>
\ No newline at end of file
diff --git a/app/templates/Sheadawson/Linkable/Models/Link_buttonghost.ss b/app/templates/Sheadawson/Linkable/Models/Link_buttonghost.ss
new file mode 100644
index 0000000..9689325
--- /dev/null
+++ b/app/templates/Sheadawson/Linkable/Models/Link_buttonghost.ss
@@ -0,0 +1,3 @@
+<% if $LinkURL %>
+    <a href="$LinkURL"{$TargetAttr}$ClassAttr class="btn btn-outline-primary ghost" title="Go to $Title">$Title</a>
+<% end_if %>
\ No newline at end of file
diff --git a/app/templates/SilverStripe/Blog/Includes/EntryMeta.ss b/app/templates/SilverStripe/Blog/Includes/EntryMeta.ss
new file mode 100644
index 0000000..7707452
--- /dev/null
+++ b/app/templates/SilverStripe/Blog/Includes/EntryMeta.ss
@@ -0,0 +1,46 @@
+<div class="blog-post-meta">
+    <%-- if $Categories.exists %>
+        <%t SilverStripe\\Blog\\Model\\Blog.PostedIn "Posted in" %>
+        <% loop $Categories %>
+            <a href="$Link" title="$Title">$Title</a><% if not Last %>, <% else %>;<% end_if %>
+        <% end_loop %>
+    <% end_if --%>
+
+    <%-- if $Tags.exists %>
+        <%t SilverStripe\\Blog\\Model\\Blog.Tagged "Tagged" %>
+        <% loop $Tags %>
+            <a href="$Link" title="$Title">$Title</a><% if not Last %>, <% else %>;<% end_if %>
+        <% end_loop %>
+    <% end_if --%>
+
+    <%-- t SilverStripe\\Blog\\Model\\Blog.Posted "Posted" %>
+    <a href="$MonthlyArchiveLink">$PublishDate.ago</a --%>
+
+    <% if $Credits %>
+        <%t SilverStripe\\Blog\\Model\\Blog.By "by" %>
+
+        <% loop $Credits %>
+            <% if not $First && not $Last %>, <% end_if %>
+            <% if not $First && $Last %> <%t SilverStripe\\Blog\\Model\\Blog.AND "and" %> <% end_if %>
+            <% if $URLSegment && not $Up.ProfilesDisabled %>
+                <a href="$URL">$Name.XML</a>
+            <% else %>
+                $Name.XML
+            <% end_if %>
+        <% end_loop %>
+    <% end_if %>
+
+    <% if $Comments.exists %>
+        <a href="{$Link}#comments-holder">
+            $Comments.count
+            <%t SilverStripe\\Blog\\Model\\Blog.Comments "comments" %>
+        </a>
+    <% end_if %>
+
+    <br/>
+    <% if $MinutesToRead < 1 %>
+        <%t SilverStripe\\Blog\\Model\\Blog.LessThanAMinuteToRead "Less than a minute to read" %>
+    <% else %>
+        $MinutesToRead <%t SilverStripe\\Blog\\Model\\Blog.MinutesToRead "Minute(s) to read" %>
+    <% end_if %>
+</div>
diff --git a/app/templates/SilverStripe/Blog/Model/Layout/Blog.ss b/app/templates/SilverStripe/Blog/Model/Layout/Blog.ss
new file mode 100644
index 0000000..4d3c5f4
--- /dev/null
+++ b/app/templates/SilverStripe/Blog/Model/Layout/Blog.ss
@@ -0,0 +1,45 @@
+<div id="PageContainer" class="page{$ClassName} action{$Action}">
+	<% include Content %>
+
+	<div class="page-content">
+		<div class="element">
+			<div class="container">
+
+				<% if $ArchiveYear %>
+					<%t SilverStripe\\Blog\\Model\\Blog.Archive 'Archive' %>:
+					<% if $ArchiveDay %>
+						<h2 class="subcategory">$ArchiveDate.Nice</h2>
+					<% else_if $ArchiveMonth %>
+						<h2 class="subcategory">$ArchiveDate.format('F, Y')</h2>
+					<% else %>
+						<h2 class="subcategory">$ArchiveDate.format('Y')</h2>
+					<% end_if %>
+				<% else_if $CurrentTag %>
+					<h2 class="subcategory"><%t SilverStripe\\Blog\\Model\\Blog.Tag 'Tag' %>: $CurrentTag.Title</h2>
+				<% else_if $CurrentCategory %>
+					<h2 class="subcategory"><%t SilverStripe\\Blog\\Model\\Blog.Category 'Category' %>: $CurrentCategory.Title</h2>
+				<% end_if %>
+
+				<% if $PaginatedList.Exists %>
+					<div class="row">
+						<% loop $PaginatedList %>
+							<div class="col-sm-4">
+								<% include BlogPostInfo %>
+							</div>
+						<% end_loop %>
+					</div>
+				<% else %>
+					<p><%t SilverStripe\\Blog\\Model\\Blog.NoPosts 'There are no posts' %></p>
+				<% end_if %>
+
+				<% with $PaginatedList %>
+					<% include SilverStripe\\Blog\\Pagination %>
+				<% end_with %>
+
+				$CommentsForm
+			</div>
+		</div>
+    </div>
+</div>
+
+<% include SilverStripe\\Blog\\BlogSideBar %>
diff --git a/app/templates/SilverStripe/Blog/Model/Layout/BlogPost.ss b/app/templates/SilverStripe/Blog/Model/Layout/BlogPost.ss
new file mode 100644
index 0000000..730f7ed
--- /dev/null
+++ b/app/templates/SilverStripe/Blog/Model/Layout/BlogPost.ss
@@ -0,0 +1,35 @@
+<div id="PageContainer" class="page{$ClassName} action{$Action}">
+    <article class="blog-entry">
+
+		<% include Content %>
+
+        <div class="page-content">
+			<div class="element">
+				<div class="container">
+					<% if $FeaturedImage %>
+					<div class="row">
+						<div class="col-sm-2">
+							$FeaturedImage.Fill(100,100)
+						</div>
+						<div class="col-sm-10">
+							<% include SilverStripe\\Blog\\EntryMeta %>
+						</div>
+					</div>
+					<% else %>
+						<% include SilverStripe\\Blog\\EntryMeta %>
+					<% end_if %>
+				</div>
+			</div>
+		</div>
+    </article>
+
+	<% if $CommentsForm %>
+    <div class="page-content">
+		<div class="element">
+			$CommentsForm
+		</div>
+	</div>
+	<% end_if %>
+</div>
+
+<% include SilverStripe\\Blog\\BlogSideBar %>
diff --git a/app/templates/SilverStripe/Blog/Model/Layout/Blog_profile.ss b/app/templates/SilverStripe/Blog/Model/Layout/Blog_profile.ss
new file mode 100644
index 0000000..5bbca51
--- /dev/null
+++ b/app/templates/SilverStripe/Blog/Model/Layout/Blog_profile.ss
@@ -0,0 +1,23 @@
+<% require css('silverstripe/blog: client/dist/styles/main.css') %>
+
+<div class="blog-entry content-container <% if $SideBarView %>unit size3of4<% end_if %>">
+
+	<% include SilverStripe\\Blog\\MemberDetails %>
+
+	<% if $PaginatedList.Exists %>
+        <h2><%t SilverStripe\\Blog\\Model\\Blog.PostsByUser 'Posts by {firstname} {surname} for {title}' firstname=$CurrentProfile.FirstName surname=$CurrentProfile.Surname title=$Title %></h2>
+		<% loop $PaginatedList %>
+			<% include SilverStripe\\Blog\\PostSummary %>
+		<% end_loop %>
+	<% end_if %>
+
+	$Form
+	$CommentsForm
+
+	<% with $PaginatedList %>
+		<% include SilverStripe\\Blog\\Pagination %>
+	<% end_with %>
+
+</div>
+
+<% include SilverStripe\\Blog\\BlogSideBar %>
diff --git a/app/templates/Site/Elements/TeamMembersElement.ss b/app/templates/Site/Elements/TeamMembersElement.ss
new file mode 100644
index 0000000..f828c35
--- /dev/null
+++ b/app/templates/Site/Elements/TeamMembersElement.ss
@@ -0,0 +1,17 @@
+<% if $Members %>
+<div class="teamMembers-element__content <% if $Style %>$CssStyle<% end_if %>">
+    <% if $ShowTitle %>
+        <h2 class="teamMembers-element__title text-center">$Title</h2>
+    <% end_if %>
+
+    <div class="teamMembers-element__content">
+        <div class="row">
+        <% loop $Members %>
+            <div class="col-sm-3">
+                <% include Objects\HCard %>
+            </div>
+        <% end_loop %>
+        </div>
+    </div>
+</div>
+<% end_if %>
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 1b953db..b5c83ed 100755
--- a/composer.json
+++ b/composer.json
@@ -27,12 +27,18 @@
         "mak001/silverstripe-categorization": "^1.0@dev",
         "axllent/silverstripe-bootstrap-forms": "^2.0",
         "silverstripe/redirectedurls": "dev-master",
-        "vulcandigital/silverstripe-seo": "*"
+        "vulcandigital/silverstripe-seo": "*",
+        "undefinedoffset/silverstripe-nocaptcha": "*",
+        "a2nt/silverstripe-font-awesome-field": "dev-master"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7",
         "lekoala/silverstripe-debugbar": "dev-master"
     },
+    "repositories": [{
+        "type": "vcs",
+        "url": "https://github.com/a2nt/silverstripe-font-awesome"
+    }],
     "extra": {
         "expose": [
             "app/client/dist",
@@ -57,14 +63,5 @@
         "process-timeout": 600
     },
     "prefer-stable": true,
-    "minimum-stability": "dev",
-    "autoload": {
-        "psr-4": {
-            "Site\\": "app/src/"
-        },
-        "classmap": [
-            "app/src/Pages/Page.php",
-            "app/src/Pages/PageController.php"
-        ]
-    }
-}
+    "minimum-stability": "dev"
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index d58f99d..54edb51 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -166,6 +166,14 @@
             "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
             "dev": true
         },
+        "abstract-leveldown": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-4.0.3.tgz",
+            "integrity": "sha512-qsIHFQy0u17JqSY+3ZUT+ykqxYY17yOfvAsLkFkw8kSQqi05d1jyj0bCuSX6sjYlXuY9cKpgUt5EudQdP4aXyA==",
+            "requires": {
+                "xtend": "~4.0.0"
+            }
+        },
         "accepts": {
             "version": "1.3.5",
             "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
@@ -331,8 +339,7 @@
         "ansi-regex": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-            "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-            "dev": true
+            "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
         },
         "ansi-styles": {
             "version": "3.2.1",
@@ -362,8 +369,7 @@
         "aproba": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-            "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-            "dev": true
+            "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
         },
         "archive-type": {
             "version": "3.2.0",
@@ -378,7 +384,6 @@
             "version": "1.1.5",
             "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
             "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-            "dev": true,
             "requires": {
                 "delegates": "^1.0.0",
                 "readable-stream": "^2.0.6"
@@ -393,6 +398,11 @@
                 "sprintf-js": "~1.0.2"
             }
         },
+        "argsarray": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/argsarray/-/argsarray-0.0.1.tgz",
+            "integrity": "sha1-bnIHtOzbObCviDA/pa4ivajfYcs="
+        },
         "arr-diff": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
@@ -478,14 +488,12 @@
         "asap": {
             "version": "2.0.6",
             "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-            "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
-            "dev": true
+            "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
         },
         "asn1": {
             "version": "0.2.3",
             "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-            "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-            "dev": true
+            "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
         },
         "asn1.js": {
             "version": "4.10.1",
@@ -558,15 +566,19 @@
         "asynckit": {
             "version": "0.4.0",
             "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-            "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-            "dev": true
+            "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
         },
         "atob": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz",
-            "integrity": "sha1-lfE2KbEsOlGl0hWr3OKqnzL4B3M=",
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz",
+            "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=",
             "dev": true
         },
+        "attempt-x": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/attempt-x/-/attempt-x-1.1.3.tgz",
+            "integrity": "sha512-y/+ek8IjxVpTbj/phC87jK5YRhlP5Uu7FlQdCmYuut1DTjNruyrGqUWi5bcX1VKsQX1B0FX16A1hqHomKpHv3A=="
+        },
         "autoprefixer": {
             "version": "7.2.6",
             "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz",
@@ -590,8 +602,7 @@
         "aws4": {
             "version": "1.6.0",
             "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-            "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-            "dev": true
+            "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
         },
         "axios": {
             "version": "0.17.1",
@@ -1640,16 +1651,15 @@
             "dev": true
         },
         "batch": {
-            "version": "0.5.3",
-            "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz",
-            "integrity": "sha1-PzQU84AyF0O/wQQvmoP/HVgk1GQ=",
+            "version": "0.6.1",
+            "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+            "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
             "dev": true
         },
         "bcrypt-pbkdf": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
             "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-            "dev": true,
             "optional": true,
             "requires": {
                 "tweetnacl": "^0.14.3"
@@ -1779,11 +1789,15 @@
             "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=",
             "dev": true
         },
+        "bindings": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz",
+            "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw=="
+        },
         "bl": {
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
             "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
-            "dev": true,
             "requires": {
                 "readable-stream": "^2.3.5",
                 "safe-buffer": "^5.1.1"
@@ -1956,15 +1970,15 @@
             "dev": true
         },
         "browser-sync": {
-            "version": "2.24.4",
-            "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.24.4.tgz",
-            "integrity": "sha512-qfXv8vQA/Dctub2v44v/vPuvfC4XNd6bn+W5vWZVuhuy6w91lPsdY6qhalT2s2PjnJ3FR6kWq5wkTQgN26eKzA==",
+            "version": "2.24.5",
+            "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.24.5.tgz",
+            "integrity": "sha512-r6ZRYncfYRGerw4Rh5S8Q9x9WKDdrwH572hd3ofsYgn0Px6a6EqXiLBVTCss2+2a45G9ZgjRHSeo9YY56UpgKw==",
             "dev": true,
             "requires": {
                 "browser-sync-ui": "v1.0.1",
                 "bs-recipes": "1.3.4",
                 "chokidar": "1.7.0",
-                "connect": "3.5.0",
+                "connect": "3.6.6",
                 "connect-history-api-fallback": "^1.5.0",
                 "dev-ip": "^1.0.1",
                 "easy-extender": "2.3.2",
@@ -1982,14 +1996,65 @@
                 "raw-body": "^2.3.2",
                 "resp-modifier": "6.0.2",
                 "rx": "4.1.0",
-                "serve-index": "1.8.0",
+                "serve-index": "1.9.1",
                 "serve-static": "1.13.2",
                 "server-destroy": "1.0.1",
-                "socket.io": "2.0.4",
+                "socket.io": "2.1.1",
                 "ua-parser-js": "0.7.17",
                 "yargs": "6.4.0"
             },
             "dependencies": {
+                "batch": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+                    "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
+                    "dev": true
+                },
+                "http-errors": {
+                    "version": "1.6.3",
+                    "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+                    "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+                    "dev": true,
+                    "requires": {
+                        "depd": "~1.1.2",
+                        "inherits": "2.0.3",
+                        "setprototypeof": "1.1.0",
+                        "statuses": ">= 1.4.0 < 2"
+                    }
+                },
+                "qs": {
+                    "version": "6.2.3",
+                    "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz",
+                    "integrity": "sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=",
+                    "dev": true
+                },
+                "serve-index": {
+                    "version": "1.9.1",
+                    "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+                    "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+                    "dev": true,
+                    "requires": {
+                        "accepts": "~1.3.4",
+                        "batch": "0.6.1",
+                        "debug": "2.6.9",
+                        "escape-html": "~1.0.3",
+                        "http-errors": "~1.6.2",
+                        "mime-types": "~2.1.17",
+                        "parseurl": "~1.3.2"
+                    }
+                },
+                "setprototypeof": {
+                    "version": "1.1.0",
+                    "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+                    "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+                    "dev": true
+                },
+                "statuses": {
+                    "version": "1.5.0",
+                    "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+                    "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+                    "dev": true
+                },
                 "ua-parser-js": {
                     "version": "0.7.17",
                     "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz",
@@ -2123,7 +2188,6 @@
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.1.0.tgz",
             "integrity": "sha1-BVFNM78WVtNUDGhPZbEgLpDsowM=",
-            "dev": true,
             "requires": {
                 "buffer-alloc-unsafe": "^0.1.0",
                 "buffer-fill": "^0.1.0"
@@ -2132,8 +2196,7 @@
         "buffer-alloc-unsafe": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz",
-            "integrity": "sha1-/+H2dVHdBVc33iUzN7/oU9+rGmo=",
-            "dev": true
+            "integrity": "sha1-/+H2dVHdBVc33iUzN7/oU9+rGmo="
         },
         "buffer-crc32": {
             "version": "0.2.13",
@@ -2150,8 +2213,7 @@
         "buffer-fill": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-0.1.1.tgz",
-            "integrity": "sha512-YgBMBzdRLEfgxJIGu2wrvI2E03tMCFU1p7d1KhB4BOoMN0VxmTFjSyN5JtKt9z8Z9JajMHruI6SE25W96wNv7Q==",
-            "dev": true
+            "integrity": "sha512-YgBMBzdRLEfgxJIGu2wrvI2E03tMCFU1p7d1KhB4BOoMN0VxmTFjSyN5JtKt9z8Z9JajMHruI6SE25W96wNv7Q=="
         },
         "buffer-from": {
             "version": "1.0.0",
@@ -2263,6 +2325,11 @@
                 }
             }
         },
+        "cached-constructors-x": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/cached-constructors-x/-/cached-constructors-x-1.0.2.tgz",
+            "integrity": "sha512-7lKwmwXweW6E/31RHAJemLtZPfb2xvcABXknFF4b/dNYv4DbSGTgQHckXLQkNw6BB4HKFYW6mJgsNjADAy1ehw=="
+        },
         "caller-path": {
             "version": "0.1.0",
             "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
@@ -2363,8 +2430,7 @@
         "caseless": {
             "version": "0.12.0",
             "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-            "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-            "dev": true
+            "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
         },
         "caw": {
             "version": "1.2.0",
@@ -2466,8 +2532,7 @@
         "chownr": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
-            "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=",
-            "dev": true
+            "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE="
         },
         "cipher-base": {
             "version": "1.0.4",
@@ -2656,6 +2721,11 @@
             "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
             "dev": true
         },
+        "clone-buffer": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+            "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg="
+        },
         "clone-deep": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
@@ -2694,8 +2764,7 @@
         "co": {
             "version": "4.6.0",
             "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-            "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-            "dev": true
+            "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
         },
         "coa": {
             "version": "1.0.4",
@@ -2709,8 +2778,7 @@
         "code-point-at": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-            "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-            "dev": true
+            "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
         },
         "collection-visit": {
             "version": "1.0.0",
@@ -2784,7 +2852,6 @@
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
             "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
-            "dev": true,
             "requires": {
                 "delayed-stream": "~1.0.0"
             }
@@ -2881,32 +2948,15 @@
             }
         },
         "connect": {
-            "version": "3.5.0",
-            "resolved": "https://registry.npmjs.org/connect/-/connect-3.5.0.tgz",
-            "integrity": "sha1-s1dSWgtMH1BZnNmD4dnv7qlncZg=",
+            "version": "3.6.6",
+            "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
+            "integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
             "dev": true,
             "requires": {
-                "debug": "~2.2.0",
-                "finalhandler": "0.5.0",
-                "parseurl": "~1.3.1",
-                "utils-merge": "1.0.0"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "2.2.0",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-                    "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-                    "dev": true,
-                    "requires": {
-                        "ms": "0.7.1"
-                    }
-                },
-                "ms": {
-                    "version": "0.7.1",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-                    "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
-                    "dev": true
-                }
+                "debug": "2.6.9",
+                "finalhandler": "1.1.0",
+                "parseurl": "~1.3.2",
+                "utils-merge": "1.0.1"
             }
         },
         "connect-history-api-fallback": {
@@ -2927,8 +2977,7 @@
         "console-control-strings": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-            "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-            "dev": true
+            "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
         },
         "console-stream": {
             "version": "0.1.1",
@@ -3215,14 +3264,14 @@
             }
         },
         "css": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/css/-/css-2.2.1.tgz",
-            "integrity": "sha1-c6TIHehdtmTU7mdPfUcIXjstVdw=",
+            "version": "2.2.3",
+            "resolved": "https://registry.npmjs.org/css/-/css-2.2.3.tgz",
+            "integrity": "sha512-0W171WccAjQGGTKLhw4m2nnl0zPHUlTO/I8td4XzJgIB8Hg3ZZx71qT4G4eX8OVsSiaAKiUMy73E3nsbPlg2DQ==",
             "dev": true,
             "requires": {
                 "inherits": "^2.0.1",
                 "source-map": "^0.1.38",
-                "source-map-resolve": "^0.3.0",
+                "source-map-resolve": "^0.5.1",
                 "urix": "^0.1.0"
             },
             "dependencies": {
@@ -3577,7 +3626,6 @@
             "version": "1.14.1",
             "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
             "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-            "dev": true,
             "requires": {
                 "assert-plus": "^1.0.0"
             },
@@ -3585,8 +3633,7 @@
                 "assert-plus": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-                    "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-                    "dev": true
+                    "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
                 }
             }
         },
@@ -3650,7 +3697,6 @@
             "version": "3.3.0",
             "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
             "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-            "dev": true,
             "requires": {
                 "mimic-response": "^1.0.0"
             }
@@ -3896,8 +3942,7 @@
         "deep-extend": {
             "version": "0.6.0",
             "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-            "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-            "dev": true
+            "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
         },
         "deep-is": {
             "version": "0.1.3",
@@ -3905,6 +3950,24 @@
             "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
             "dev": true
         },
+        "deferred-leveldown": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-2.0.3.tgz",
+            "integrity": "sha512-8c2Hv+vIwKNc7qqy4zE3t5DIsln+FQnudcyjLYstHwLFg7XnXZT/H8gQb8lj6xi8xqGM0Bz633ZWcCkonycBTA==",
+            "requires": {
+                "abstract-leveldown": "~3.0.0"
+            },
+            "dependencies": {
+                "abstract-leveldown": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-3.0.0.tgz",
+                    "integrity": "sha512-KUWx9UWGQD12zsmLNj64/pndaz4iJh/Pj7nopgkfDG6RlCcbMZvT6+9l7dchK4idog2Is8VdC/PvNbFuFmalIQ==",
+                    "requires": {
+                        "xtend": "~4.0.0"
+                    }
+                }
+            }
+        },
         "define-properties": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
@@ -3979,14 +4042,12 @@
         "delayed-stream": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-            "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-            "dev": true
+            "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
         },
         "delegates": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-            "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-            "dev": true
+            "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
         },
         "depd": {
             "version": "1.1.2",
@@ -4019,6 +4080,11 @@
                 "repeating": "^2.0.0"
             }
         },
+        "detect-libc": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+            "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
+        },
         "detect-node": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.3.tgz",
@@ -4180,6 +4246,11 @@
             "integrity": "sha1-3vHxyl1gWdJKdm5YeULCEQbOEnU=",
             "dev": true
         },
+        "double-ended-queue": {
+            "version": "2.1.0-0",
+            "resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz",
+            "integrity": "sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw="
+        },
         "download": {
             "version": "4.4.3",
             "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz",
@@ -4278,7 +4349,6 @@
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
             "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-            "dev": true,
             "optional": true,
             "requires": {
                 "jsbn": "~0.1.0"
@@ -4327,24 +4397,48 @@
             "version": "0.1.12",
             "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
             "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
-            "dev": true,
             "requires": {
                 "iconv-lite": "~0.4.13"
             }
         },
+        "encoding-down": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-4.0.1.tgz",
+            "integrity": "sha512-AlSE+ugBIpLL0i9if2SlnOZ4oWj/XvBb8tw2Ie/pFB73vdYs5O/6plRyqIgjbZbz8onaL20AAuMP87LWbP56IQ==",
+            "requires": {
+                "abstract-leveldown": "^4.0.0",
+                "level-codec": "^8.0.0",
+                "level-errors": "^1.0.4",
+                "xtend": "^4.0.1"
+            },
+            "dependencies": {
+                "level-codec": {
+                    "version": "8.0.0",
+                    "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-8.0.0.tgz",
+                    "integrity": "sha512-gNZlo1HRHz0BWxzGCyNf7xntAs2HKOPvvRBWtXsoDvEX4vMYnSTBS6ZnxoaiX7nhxSBPpegRa8CQ/hnfGBKk3Q=="
+                }
+            }
+        },
         "end-of-stream": {
             "version": "1.4.1",
             "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
             "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-            "dev": true,
             "requires": {
                 "once": "^1.4.0"
             }
         },
+        "end-stream": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/end-stream/-/end-stream-0.1.0.tgz",
+            "integrity": "sha1-MgA/P0OKKwFDFoE3+PpumGbIHtU=",
+            "requires": {
+                "write-stream": "~0.4.3"
+            }
+        },
         "engine.io": {
-            "version": "3.1.5",
-            "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.1.5.tgz",
-            "integrity": "sha512-D06ivJkYxyRrcEe0bTpNnBQNgP9d3xog+qZlLbui8EsMr/DouQpf5o9FzJnWYHEYE0YsFHllUv2R1dkgYZXHcA==",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.0.tgz",
+            "integrity": "sha512-mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw==",
             "dev": true,
             "requires": {
                 "accepts": "~1.3.4",
@@ -4352,7 +4446,6 @@
                 "cookie": "0.3.1",
                 "debug": "~3.1.0",
                 "engine.io-parser": "~2.1.0",
-                "uws": "~9.14.0",
                 "ws": "~3.3.1"
             },
             "dependencies": {
@@ -4420,7 +4513,6 @@
             "version": "0.1.7",
             "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
             "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
-            "dev": true,
             "requires": {
                 "prr": "~1.0.1"
             }
@@ -5044,6 +5136,11 @@
                 "fill-range": "^2.1.0"
             }
         },
+        "expand-template": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-1.1.1.tgz",
+            "integrity": "sha512-cebqLtV8KOZfw0UI8TEFWxtczxxC1jvyUvx6H4fyp1K1FN7A4Q+uggVUlOsI1K8AGU0rwOGqP8nCapdrw8CYQg=="
+        },
         "exports-loader": {
             "version": "0.7.0",
             "resolved": "https://registry.npmjs.org/exports-loader/-/exports-loader-0.7.0.tgz",
@@ -5234,8 +5331,7 @@
         "extend": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-            "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-            "dev": true
+            "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
         },
         "extend-shallow": {
             "version": "2.0.1",
@@ -5304,8 +5400,7 @@
         "extsprintf": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-            "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-            "dev": true
+            "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
         },
         "fancy-log": {
             "version": "1.3.2",
@@ -5321,14 +5416,17 @@
         "fast-deep-equal": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-            "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
-            "dev": true
+            "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
+        },
+        "fast-future": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/fast-future/-/fast-future-1.0.2.tgz",
+            "integrity": "sha1-hDWpqqAteSSNF9cE52JZMB2ZKAo="
         },
         "fast-json-stable-stringify": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-            "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-            "dev": true
+            "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
         },
         "fast-levenshtein": {
             "version": "2.0.6",
@@ -5406,7 +5504,6 @@
             "version": "0.8.16",
             "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz",
             "integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=",
-            "dev": true,
             "requires": {
                 "core-js": "^1.0.0",
                 "isomorphic-fetch": "^2.1.1",
@@ -5420,8 +5517,7 @@
                 "core-js": {
                     "version": "1.2.7",
                     "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
-                    "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=",
-                    "dev": true
+                    "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
                 }
             }
         },
@@ -5522,46 +5618,31 @@
             }
         },
         "fill-range": {
-            "version": "2.2.3",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-            "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
+            "version": "2.2.4",
+            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+            "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
             "dev": true,
             "requires": {
                 "is-number": "^2.1.0",
                 "isobject": "^2.0.0",
-                "randomatic": "^1.1.3",
+                "randomatic": "^3.0.0",
                 "repeat-element": "^1.1.2",
                 "repeat-string": "^1.5.2"
             }
         },
         "finalhandler": {
-            "version": "0.5.0",
-            "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz",
-            "integrity": "sha1-6VCKvs6bbbqHGmlCodeRG5GRGsc=",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
+            "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
             "dev": true,
             "requires": {
-                "debug": "~2.2.0",
+                "debug": "2.6.9",
+                "encodeurl": "~1.0.1",
                 "escape-html": "~1.0.3",
                 "on-finished": "~2.3.0",
-                "statuses": "~1.3.0",
+                "parseurl": "~1.3.2",
+                "statuses": "~1.3.1",
                 "unpipe": "~1.0.0"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "2.2.0",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-                    "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-                    "dev": true,
-                    "requires": {
-                        "ms": "0.7.1"
-                    }
-                },
-                "ms": {
-                    "version": "0.7.1",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-                    "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
-                    "dev": true
-                }
             }
         },
         "find-cache-dir": {
@@ -5631,9 +5712,9 @@
             }
         },
         "follow-redirects": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.4.1.tgz",
-            "integrity": "sha512-uxYePVPogtya1ktGnAAXOacnbIuRMB4dkvqeNz2qTtTQsuzSfbDolV+wMMKxAmCx0bLgAKLbBOkjItMbbkR1vg==",
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.0.tgz",
+            "integrity": "sha512-fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA==",
             "dev": true,
             "requires": {
                 "debug": "^3.1.0"
@@ -5688,8 +5769,7 @@
         "forever-agent": {
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-            "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-            "dev": true
+            "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
         },
         "form-data": {
             "version": "2.1.4",
@@ -5821,8 +5901,7 @@
         "fs-constants": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-            "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-            "dev": true
+            "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
         },
         "fs-extra": {
             "version": "3.0.1",
@@ -5854,39 +5933,29 @@
             "dev": true
         },
         "fsevents": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
-            "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
+            "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
             "dev": true,
             "optional": true,
             "requires": {
-                "nan": "^2.3.0",
-                "node-pre-gyp": "^0.6.39"
+                "nan": "^2.9.2",
+                "node-pre-gyp": "^0.10.0"
             },
             "dependencies": {
                 "abbrev": {
-                    "version": "1.1.0",
+                    "version": "1.1.1",
                     "bundled": true,
                     "dev": true,
                     "optional": true
                 },
-                "ajv": {
-                    "version": "4.11.8",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "co": "^4.6.0",
-                        "json-stable-stringify": "^1.0.1"
-                    }
-                },
                 "ansi-regex": {
                     "version": "2.1.1",
                     "bundled": true,
                     "dev": true
                 },
                 "aproba": {
-                    "version": "1.1.1",
+                    "version": "1.2.0",
                     "bundled": true,
                     "dev": true,
                     "optional": true
@@ -5901,88 +5970,22 @@
                         "readable-stream": "^2.0.6"
                     }
                 },
-                "asn1": {
-                    "version": "0.2.3",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true
-                },
-                "assert-plus": {
-                    "version": "0.2.0",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true
-                },
-                "asynckit": {
-                    "version": "0.4.0",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true
-                },
-                "aws-sign2": {
-                    "version": "0.6.0",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true
-                },
-                "aws4": {
-                    "version": "1.6.0",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true
-                },
                 "balanced-match": {
-                    "version": "0.4.2",
-                    "bundled": true,
-                    "dev": true
-                },
-                "bcrypt-pbkdf": {
-                    "version": "1.0.1",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "tweetnacl": "^0.14.3"
-                    }
-                },
-                "block-stream": {
-                    "version": "0.0.9",
-                    "bundled": true,
-                    "dev": true,
-                    "requires": {
-                        "inherits": "~2.0.0"
-                    }
-                },
-                "boom": {
-                    "version": "2.10.1",
-                    "bundled": true,
-                    "dev": true,
-                    "requires": {
-                        "hoek": "2.x.x"
-                    }
-                },
-                "brace-expansion": {
-                    "version": "1.1.7",
-                    "bundled": true,
-                    "dev": true,
-                    "requires": {
-                        "balanced-match": "^0.4.1",
-                        "concat-map": "0.0.1"
-                    }
-                },
-                "buffer-shims": {
                     "version": "1.0.0",
                     "bundled": true,
                     "dev": true
                 },
-                "caseless": {
-                    "version": "0.12.0",
+                "brace-expansion": {
+                    "version": "1.1.11",
                     "bundled": true,
                     "dev": true,
-                    "optional": true
+                    "requires": {
+                        "balanced-match": "^1.0.0",
+                        "concat-map": "0.0.1"
+                    }
                 },
-                "co": {
-                    "version": "4.6.0",
+                "chownr": {
+                    "version": "1.0.1",
                     "bundled": true,
                     "dev": true,
                     "optional": true
@@ -5992,14 +5995,6 @@
                     "bundled": true,
                     "dev": true
                 },
-                "combined-stream": {
-                    "version": "1.0.5",
-                    "bundled": true,
-                    "dev": true,
-                    "requires": {
-                        "delayed-stream": "~1.0.0"
-                    }
-                },
                 "concat-map": {
                     "version": "0.0.1",
                     "bundled": true,
@@ -6013,35 +6008,11 @@
                 "core-util-is": {
                     "version": "1.0.2",
                     "bundled": true,
-                    "dev": true
-                },
-                "cryptiles": {
-                    "version": "2.0.5",
-                    "bundled": true,
                     "dev": true,
-                    "requires": {
-                        "boom": "2.x.x"
-                    }
-                },
-                "dashdash": {
-                    "version": "1.14.1",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "assert-plus": "^1.0.0"
-                    },
-                    "dependencies": {
-                        "assert-plus": {
-                            "version": "1.0.0",
-                            "bundled": true,
-                            "dev": true,
-                            "optional": true
-                        }
-                    }
+                    "optional": true
                 },
                 "debug": {
-                    "version": "2.6.8",
+                    "version": "2.6.9",
                     "bundled": true,
                     "dev": true,
                     "optional": true,
@@ -6050,16 +6021,11 @@
                     }
                 },
                 "deep-extend": {
-                    "version": "0.4.2",
+                    "version": "0.5.1",
                     "bundled": true,
                     "dev": true,
                     "optional": true
                 },
-                "delayed-stream": {
-                    "version": "1.0.0",
-                    "bundled": true,
-                    "dev": true
-                },
                 "delegates": {
                     "version": "1.0.0",
                     "bundled": true,
@@ -6067,74 +6033,25 @@
                     "optional": true
                 },
                 "detect-libc": {
-                    "version": "1.0.2",
+                    "version": "1.0.3",
                     "bundled": true,
                     "dev": true,
                     "optional": true
                 },
-                "ecc-jsbn": {
-                    "version": "0.1.1",
+                "fs-minipass": {
+                    "version": "1.2.5",
                     "bundled": true,
                     "dev": true,
                     "optional": true,
                     "requires": {
-                        "jsbn": "~0.1.0"
-                    }
-                },
-                "extend": {
-                    "version": "3.0.1",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true
-                },
-                "extsprintf": {
-                    "version": "1.0.2",
-                    "bundled": true,
-                    "dev": true
-                },
-                "forever-agent": {
-                    "version": "0.6.1",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true
-                },
-                "form-data": {
-                    "version": "2.1.4",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "asynckit": "0.4.0",
-                        "combined-stream": "1.0.5",
-                        "mime-types": "2.1.15"
+                        "minipass": "^2.2.1"
                     }
                 },
                 "fs.realpath": {
                     "version": "1.0.0",
                     "bundled": true,
-                    "dev": true
-                },
-                "fstream": {
-                    "version": "1.0.11",
-                    "bundled": true,
                     "dev": true,
-                    "requires": {
-                        "graceful-fs": "^4.1.2",
-                        "inherits": "~2.0.0",
-                        "mkdirp": ">=0.5 0",
-                        "rimraf": "2"
-                    }
-                },
-                "fstream-ignore": {
-                    "version": "1.0.5",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "fstream": "^1.0.0",
-                        "inherits": "2",
-                        "minimatch": "^3.0.0"
-                    }
+                    "optional": true
                 },
                 "gauge": {
                     "version": "2.7.4",
@@ -6152,27 +6069,11 @@
                         "wide-align": "^1.1.0"
                     }
                 },
-                "getpass": {
-                    "version": "0.1.7",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "assert-plus": "^1.0.0"
-                    },
-                    "dependencies": {
-                        "assert-plus": {
-                            "version": "1.0.0",
-                            "bundled": true,
-                            "dev": true,
-                            "optional": true
-                        }
-                    }
-                },
                 "glob": {
                     "version": "7.1.2",
                     "bundled": true,
                     "dev": true,
+                    "optional": true,
                     "requires": {
                         "fs.realpath": "^1.0.0",
                         "inflight": "^1.0.4",
@@ -6182,64 +6083,35 @@
                         "path-is-absolute": "^1.0.0"
                     }
                 },
-                "graceful-fs": {
-                    "version": "4.1.11",
-                    "bundled": true,
-                    "dev": true
-                },
-                "har-schema": {
-                    "version": "1.0.5",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true
-                },
-                "har-validator": {
-                    "version": "4.2.1",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "ajv": "4.11.8",
-                        "har-schema": "1.0.5"
-                    }
-                },
                 "has-unicode": {
                     "version": "2.0.1",
                     "bundled": true,
                     "dev": true,
                     "optional": true
                 },
-                "hawk": {
-                    "version": "3.1.3",
-                    "bundled": true,
-                    "dev": true,
-                    "requires": {
-                        "boom": "2.x.x",
-                        "cryptiles": "2.x.x",
-                        "hoek": "2.x.x",
-                        "sntp": "1.x.x"
-                    }
-                },
-                "hoek": {
-                    "version": "2.16.3",
-                    "bundled": true,
-                    "dev": true
-                },
-                "http-signature": {
-                    "version": "1.1.1",
+                "iconv-lite": {
+                    "version": "0.4.21",
                     "bundled": true,
                     "dev": true,
                     "optional": true,
                     "requires": {
-                        "assert-plus": "^0.2.0",
-                        "jsprim": "^1.2.2",
-                        "sshpk": "^1.7.0"
+                        "safer-buffer": "^2.1.0"
+                    }
+                },
+                "ignore-walk": {
+                    "version": "3.0.1",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "minimatch": "^3.0.4"
                     }
                 },
                 "inflight": {
                     "version": "1.0.6",
                     "bundled": true,
                     "dev": true,
+                    "optional": true,
                     "requires": {
                         "once": "^1.3.0",
                         "wrappy": "1"
@@ -6251,7 +6123,7 @@
                     "dev": true
                 },
                 "ini": {
-                    "version": "1.3.4",
+                    "version": "1.3.5",
                     "bundled": true,
                     "dev": true,
                     "optional": true
@@ -6261,107 +6133,21 @@
                     "bundled": true,
                     "dev": true,
                     "requires": {
-                        "number-is-nan": "1.0.1"
+                        "number-is-nan": "^1.0.0"
                     }
                 },
-                "is-typedarray": {
-                    "version": "1.0.0",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true
-                },
                 "isarray": {
                     "version": "1.0.0",
                     "bundled": true,
-                    "dev": true
-                },
-                "isstream": {
-                    "version": "0.1.2",
-                    "bundled": true,
                     "dev": true,
                     "optional": true
                 },
-                "jodid25519": {
-                    "version": "1.0.2",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "jsbn": "~0.1.0"
-                    }
-                },
-                "jsbn": {
-                    "version": "0.1.1",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true
-                },
-                "json-schema": {
-                    "version": "0.2.3",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true
-                },
-                "json-stable-stringify": {
-                    "version": "1.0.1",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "jsonify": "~0.0.0"
-                    }
-                },
-                "json-stringify-safe": {
-                    "version": "5.0.1",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true
-                },
-                "jsonify": {
-                    "version": "0.0.0",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true
-                },
-                "jsprim": {
-                    "version": "1.4.0",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "assert-plus": "1.0.0",
-                        "extsprintf": "1.0.2",
-                        "json-schema": "0.2.3",
-                        "verror": "1.3.6"
-                    },
-                    "dependencies": {
-                        "assert-plus": {
-                            "version": "1.0.0",
-                            "bundled": true,
-                            "dev": true,
-                            "optional": true
-                        }
-                    }
-                },
-                "mime-db": {
-                    "version": "1.27.0",
-                    "bundled": true,
-                    "dev": true
-                },
-                "mime-types": {
-                    "version": "2.1.15",
-                    "bundled": true,
-                    "dev": true,
-                    "requires": {
-                        "mime-db": "1.27.0"
-                    }
-                },
                 "minimatch": {
                     "version": "3.0.4",
                     "bundled": true,
                     "dev": true,
                     "requires": {
-                        "brace-expansion": "1.1.7"
+                        "brace-expansion": "^1.1.7"
                     }
                 },
                 "minimist": {
@@ -6369,6 +6155,24 @@
                     "bundled": true,
                     "dev": true
                 },
+                "minipass": {
+                    "version": "2.2.4",
+                    "bundled": true,
+                    "dev": true,
+                    "requires": {
+                        "safe-buffer": "^5.1.1",
+                        "yallist": "^3.0.0"
+                    }
+                },
+                "minizlib": {
+                    "version": "1.1.0",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "minipass": "^2.2.1"
+                    }
+                },
                 "mkdirp": {
                     "version": "0.5.1",
                     "bundled": true,
@@ -6383,23 +6187,33 @@
                     "dev": true,
                     "optional": true
                 },
+                "needle": {
+                    "version": "2.2.0",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "debug": "^2.1.2",
+                        "iconv-lite": "^0.4.4",
+                        "sax": "^1.2.4"
+                    }
+                },
                 "node-pre-gyp": {
-                    "version": "0.6.39",
+                    "version": "0.10.0",
                     "bundled": true,
                     "dev": true,
                     "optional": true,
                     "requires": {
                         "detect-libc": "^1.0.2",
-                        "hawk": "3.1.3",
                         "mkdirp": "^0.5.1",
+                        "needle": "^2.2.0",
                         "nopt": "^4.0.1",
+                        "npm-packlist": "^1.1.6",
                         "npmlog": "^4.0.2",
                         "rc": "^1.1.7",
-                        "request": "2.81.0",
                         "rimraf": "^2.6.1",
                         "semver": "^5.3.0",
-                        "tar": "^2.2.1",
-                        "tar-pack": "^3.4.0"
+                        "tar": "^4"
                     }
                 },
                 "nopt": {
@@ -6412,8 +6226,24 @@
                         "osenv": "^0.1.4"
                     }
                 },
+                "npm-bundled": {
+                    "version": "1.0.3",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "npm-packlist": {
+                    "version": "1.1.10",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "ignore-walk": "^3.0.1",
+                        "npm-bundled": "^1.0.1"
+                    }
+                },
                 "npmlog": {
-                    "version": "4.1.0",
+                    "version": "4.1.2",
                     "bundled": true,
                     "dev": true,
                     "optional": true,
@@ -6429,12 +6259,6 @@
                     "bundled": true,
                     "dev": true
                 },
-                "oauth-sign": {
-                    "version": "0.8.2",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true
-                },
                 "object-assign": {
                     "version": "4.1.1",
                     "bundled": true,
@@ -6462,7 +6286,7 @@
                     "optional": true
                 },
                 "osenv": {
-                    "version": "0.1.4",
+                    "version": "0.1.5",
                     "bundled": true,
                     "dev": true,
                     "optional": true,
@@ -6474,38 +6298,22 @@
                 "path-is-absolute": {
                     "version": "1.0.1",
                     "bundled": true,
-                    "dev": true
-                },
-                "performance-now": {
-                    "version": "0.2.0",
-                    "bundled": true,
                     "dev": true,
                     "optional": true
                 },
                 "process-nextick-args": {
-                    "version": "1.0.7",
-                    "bundled": true,
-                    "dev": true
-                },
-                "punycode": {
-                    "version": "1.4.1",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true
-                },
-                "qs": {
-                    "version": "6.4.0",
+                    "version": "2.0.0",
                     "bundled": true,
                     "dev": true,
                     "optional": true
                 },
                 "rc": {
-                    "version": "1.2.1",
+                    "version": "1.2.7",
                     "bundled": true,
                     "dev": true,
                     "optional": true,
                     "requires": {
-                        "deep-extend": "~0.4.0",
+                        "deep-extend": "^0.5.1",
                         "ini": "~1.3.0",
                         "minimist": "^1.2.0",
                         "strip-json-comments": "~2.0.1"
@@ -6520,64 +6328,48 @@
                     }
                 },
                 "readable-stream": {
-                    "version": "2.2.9",
-                    "bundled": true,
-                    "dev": true,
-                    "requires": {
-                        "buffer-shims": "~1.0.0",
-                        "core-util-is": "~1.0.0",
-                        "inherits": "~2.0.1",
-                        "isarray": "~1.0.0",
-                        "process-nextick-args": "~1.0.6",
-                        "string_decoder": "~1.0.0",
-                        "util-deprecate": "~1.0.1"
-                    }
-                },
-                "request": {
-                    "version": "2.81.0",
+                    "version": "2.3.6",
                     "bundled": true,
                     "dev": true,
                     "optional": true,
                     "requires": {
-                        "aws-sign2": "~0.6.0",
-                        "aws4": "^1.2.1",
-                        "caseless": "~0.12.0",
-                        "combined-stream": "~1.0.5",
-                        "extend": "~3.0.0",
-                        "forever-agent": "~0.6.1",
-                        "form-data": "~2.1.1",
-                        "har-validator": "~4.2.1",
-                        "hawk": "~3.1.3",
-                        "http-signature": "~1.1.0",
-                        "is-typedarray": "~1.0.0",
-                        "isstream": "~0.1.2",
-                        "json-stringify-safe": "~5.0.1",
-                        "mime-types": "~2.1.7",
-                        "oauth-sign": "~0.8.1",
-                        "performance-now": "^0.2.0",
-                        "qs": "~6.4.0",
-                        "safe-buffer": "^5.0.1",
-                        "stringstream": "~0.0.4",
-                        "tough-cookie": "~2.3.0",
-                        "tunnel-agent": "^0.6.0",
-                        "uuid": "^3.0.0"
+                        "core-util-is": "~1.0.0",
+                        "inherits": "~2.0.3",
+                        "isarray": "~1.0.0",
+                        "process-nextick-args": "~2.0.0",
+                        "safe-buffer": "~5.1.1",
+                        "string_decoder": "~1.1.1",
+                        "util-deprecate": "~1.0.1"
                     }
                 },
                 "rimraf": {
-                    "version": "2.6.1",
+                    "version": "2.6.2",
                     "bundled": true,
                     "dev": true,
+                    "optional": true,
                     "requires": {
                         "glob": "^7.0.5"
                     }
                 },
                 "safe-buffer": {
-                    "version": "5.0.1",
+                    "version": "5.1.1",
                     "bundled": true,
                     "dev": true
                 },
+                "safer-buffer": {
+                    "version": "2.1.2",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "sax": {
+                    "version": "1.2.4",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
                 "semver": {
-                    "version": "5.3.0",
+                    "version": "5.5.0",
                     "bundled": true,
                     "dev": true,
                     "optional": true
@@ -6594,39 +6386,6 @@
                     "dev": true,
                     "optional": true
                 },
-                "sntp": {
-                    "version": "1.0.9",
-                    "bundled": true,
-                    "dev": true,
-                    "requires": {
-                        "hoek": "2.x.x"
-                    }
-                },
-                "sshpk": {
-                    "version": "1.13.0",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "asn1": "~0.2.3",
-                        "assert-plus": "^1.0.0",
-                        "bcrypt-pbkdf": "^1.0.0",
-                        "dashdash": "^1.12.0",
-                        "ecc-jsbn": "~0.1.1",
-                        "getpass": "^0.1.1",
-                        "jodid25519": "^1.0.0",
-                        "jsbn": "~0.1.0",
-                        "tweetnacl": "~0.14.0"
-                    },
-                    "dependencies": {
-                        "assert-plus": {
-                            "version": "1.0.0",
-                            "bundled": true,
-                            "dev": true,
-                            "optional": true
-                        }
-                    }
-                },
                 "string-width": {
                     "version": "1.0.2",
                     "bundled": true,
@@ -6638,19 +6397,14 @@
                     }
                 },
                 "string_decoder": {
-                    "version": "1.0.1",
+                    "version": "1.1.1",
                     "bundled": true,
                     "dev": true,
+                    "optional": true,
                     "requires": {
-                        "safe-buffer": "^5.0.1"
+                        "safe-buffer": "~5.1.0"
                     }
                 },
-                "stringstream": {
-                    "version": "0.0.5",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true
-                },
                 "strip-ansi": {
                     "version": "3.0.1",
                     "bundled": true,
@@ -6666,81 +6420,26 @@
                     "optional": true
                 },
                 "tar": {
-                    "version": "2.2.1",
-                    "bundled": true,
-                    "dev": true,
-                    "requires": {
-                        "block-stream": "*",
-                        "fstream": "^1.0.2",
-                        "inherits": "2"
-                    }
-                },
-                "tar-pack": {
-                    "version": "3.4.0",
+                    "version": "4.4.1",
                     "bundled": true,
                     "dev": true,
                     "optional": true,
                     "requires": {
-                        "debug": "^2.2.0",
-                        "fstream": "^1.0.10",
-                        "fstream-ignore": "^1.0.5",
-                        "once": "^1.3.3",
-                        "readable-stream": "^2.1.4",
-                        "rimraf": "^2.5.1",
-                        "tar": "^2.2.1",
-                        "uid-number": "^0.0.6"
+                        "chownr": "^1.0.1",
+                        "fs-minipass": "^1.2.5",
+                        "minipass": "^2.2.4",
+                        "minizlib": "^1.1.0",
+                        "mkdirp": "^0.5.0",
+                        "safe-buffer": "^5.1.1",
+                        "yallist": "^3.0.2"
                     }
                 },
-                "tough-cookie": {
-                    "version": "2.3.2",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "punycode": "^1.4.1"
-                    }
-                },
-                "tunnel-agent": {
-                    "version": "0.6.0",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "safe-buffer": "^5.0.1"
-                    }
-                },
-                "tweetnacl": {
-                    "version": "0.14.5",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true
-                },
-                "uid-number": {
-                    "version": "0.0.6",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true
-                },
                 "util-deprecate": {
                     "version": "1.0.2",
                     "bundled": true,
-                    "dev": true
-                },
-                "uuid": {
-                    "version": "3.0.1",
-                    "bundled": true,
                     "dev": true,
                     "optional": true
                 },
-                "verror": {
-                    "version": "1.3.6",
-                    "bundled": true,
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "extsprintf": "1.0.2"
-                    }
-                },
                 "wide-align": {
                     "version": "1.1.2",
                     "bundled": true,
@@ -6754,6 +6453,11 @@
                     "version": "1.0.2",
                     "bundled": true,
                     "dev": true
+                },
+                "yallist": {
+                    "version": "3.0.2",
+                    "bundled": true,
+                    "dev": true
                 }
             }
         },
@@ -6785,7 +6489,6 @@
             "version": "2.7.4",
             "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
             "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-            "dev": true,
             "requires": {
                 "aproba": "^1.0.3",
                 "console-control-strings": "^1.0.0",
@@ -6862,7 +6565,6 @@
             "version": "0.1.7",
             "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
             "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-            "dev": true,
             "requires": {
                 "assert-plus": "^1.0.0"
             },
@@ -6870,8 +6572,7 @@
                 "assert-plus": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-                    "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-                    "dev": true
+                    "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
                 }
             }
         },
@@ -6886,6 +6587,11 @@
                 "logalot": "^2.0.0"
             }
         },
+        "github-from-package": {
+            "version": "0.0.0",
+            "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+            "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4="
+        },
         "glob": {
             "version": "7.1.2",
             "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
@@ -7254,19 +6960,33 @@
             "dev": true
         },
         "har-schema": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-            "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+            "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
             "dev": true
         },
         "har-validator": {
-            "version": "4.2.1",
-            "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-            "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+            "version": "5.0.3",
+            "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+            "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
             "dev": true,
             "requires": {
-                "ajv": "^4.9.1",
-                "har-schema": "^1.0.5"
+                "ajv": "^5.1.0",
+                "har-schema": "^2.0.0"
+            },
+            "dependencies": {
+                "ajv": {
+                    "version": "5.5.2",
+                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+                    "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+                    "dev": true,
+                    "requires": {
+                        "co": "^4.6.0",
+                        "fast-deep-equal": "^1.0.0",
+                        "fast-json-stable-stringify": "^2.0.0",
+                        "json-schema-traverse": "^0.3.0"
+                    }
+                }
             }
         },
         "harmony-reflect": {
@@ -7294,12 +7014,20 @@
             }
         },
         "has-binary2": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.2.tgz",
-            "integrity": "sha1-6D26SfC5vk0CbSc2U1DZ8D9Uvpg=",
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
+            "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
             "dev": true,
             "requires": {
                 "isarray": "2.0.1"
+            },
+            "dependencies": {
+                "isarray": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+                    "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
+                    "dev": true
+                }
             }
         },
         "has-cors": {
@@ -7323,17 +7051,25 @@
                 "sparkles": "^1.0.0"
             }
         },
+        "has-own-property-x": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/has-own-property-x/-/has-own-property-x-3.2.0.tgz",
+            "integrity": "sha512-HtRQTYpRFz/YVaQ7jh2mU5iorMAxFcML9FNOLMI1f8VNJ2K0hpOlXoi1a+nmVl6oUcGnhd6zYOFAVe7NUFStyQ==",
+            "requires": {
+                "cached-constructors-x": "^1.0.0",
+                "to-object-x": "^1.5.0",
+                "to-property-key-x": "^2.0.2"
+            }
+        },
         "has-symbol-support-x": {
             "version": "1.4.2",
             "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
-            "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
-            "dev": true
+            "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="
         },
         "has-to-string-tag-x": {
             "version": "1.4.1",
             "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
             "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
-            "dev": true,
             "requires": {
                 "has-symbol-support-x": "^1.4.1"
             }
@@ -7341,8 +7077,7 @@
         "has-unicode": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-            "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-            "dev": true
+            "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
         },
         "has-value": {
             "version": "1.0.0",
@@ -7646,14 +7381,23 @@
             "dev": true
         },
         "http-errors": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz",
-            "integrity": "sha1-eIwNLB3iyBuebowBhDtrl+uSB1A=",
+            "version": "1.6.3",
+            "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+            "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
             "dev": true,
             "requires": {
+                "depd": "~1.1.2",
                 "inherits": "2.0.3",
-                "setprototypeof": "1.0.2",
-                "statuses": ">= 1.3.1 < 2"
+                "setprototypeof": "1.1.0",
+                "statuses": ">= 1.4.0 < 2"
+            },
+            "dependencies": {
+                "statuses": {
+                    "version": "1.5.0",
+                    "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+                    "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+                    "dev": true
+                }
             }
         },
         "http-parser-js": {
@@ -7725,8 +7469,7 @@
         "iconv-lite": {
             "version": "0.4.19",
             "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-            "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
-            "dev": true
+            "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
         },
         "icss-replace-symbols": {
             "version": "1.1.0",
@@ -8054,6 +7797,11 @@
                 "loader-utils": "^1.1.0"
             }
         },
+        "immediate": {
+            "version": "3.0.6",
+            "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+            "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
+        },
         "immutable": {
             "version": "3.8.2",
             "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz",
@@ -8103,6 +7851,11 @@
             "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
             "dev": true
         },
+        "infinity-x": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/infinity-x/-/infinity-x-1.0.2.tgz",
+            "integrity": "sha512-2Ioz+exrAwlHxFBaDHQIbvUyjKFt0YjIal34/agfzx738aT1zBQwSU5A8Zgb1IQ2r24BtXrkeZZusxE40MyZaQ=="
+        },
         "inflight": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -8116,14 +7869,12 @@
         "inherits": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-            "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-            "dev": true
+            "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
         },
         "ini": {
             "version": "1.3.5",
             "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-            "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-            "dev": true
+            "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
         },
         "inquirer": {
             "version": "3.3.0",
@@ -8254,6 +8005,18 @@
                 }
             }
         },
+        "is-array-buffer-x": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/is-array-buffer-x/-/is-array-buffer-x-1.7.0.tgz",
+            "integrity": "sha512-ufSZRMY2WZX5xyNvk0NOZAG7cgi35B/sGQDGqv8w0X7MoQ2GC9vedanJhuYTPaC4PUCqLQsda1w7NF+dPZmAJw==",
+            "requires": {
+                "attempt-x": "^1.1.0",
+                "has-to-string-tag-x": "^1.4.1",
+                "is-object-like-x": "^1.5.1",
+                "object-get-own-property-descriptor-x": "^3.2.0",
+                "to-string-tag-x": "^1.4.1"
+            }
+        },
         "is-arrayish": {
             "version": "0.2.1",
             "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -8316,8 +8079,7 @@
         "is-date-object": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-            "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
-            "dev": true
+            "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
         },
         "is-descriptor": {
             "version": "1.0.2",
@@ -8371,6 +8133,14 @@
             "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
             "dev": true
         },
+        "is-falsey-x": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/is-falsey-x/-/is-falsey-x-1.0.3.tgz",
+            "integrity": "sha512-RWjusR6LXAhGa0Vus7aD1rwJuJwdJsvG3daAVMDvOAgvGuGm4eilNgoSuXhpv2/2qpLDvioAKTNb3t3XYidCNg==",
+            "requires": {
+                "to-boolean-x": "^1.0.2"
+            }
+        },
         "is-finite": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
@@ -8380,11 +8150,19 @@
                 "number-is-nan": "^1.0.0"
             }
         },
+        "is-finite-x": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/is-finite-x/-/is-finite-x-3.0.4.tgz",
+            "integrity": "sha512-wdSI5zk/Pl21HzGcLWFoFzuDa8gsgcqhwZGAZryL2eU7RKf7+g+q4jL2gGItrBs/YtspkjOrJ4JxXNZqquoAWA==",
+            "requires": {
+                "infinity-x": "^1.0.1",
+                "is-nan-x": "^1.0.2"
+            }
+        },
         "is-fullwidth-code-point": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
             "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-            "dev": true,
             "requires": {
                 "number-is-nan": "^1.0.0"
             }
@@ -8395,6 +8173,21 @@
             "integrity": "sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU=",
             "dev": true
         },
+        "is-function-x": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/is-function-x/-/is-function-x-3.3.0.tgz",
+            "integrity": "sha512-SreSSU1dlgYaXR5c0mm4qJHKYHIiGiEY+7Cd8/aRLLoMP/VvofD2XcWgBnP833ajpU5XzXbUSpfysnfKZLJFlg==",
+            "requires": {
+                "attempt-x": "^1.1.1",
+                "has-to-string-tag-x": "^1.4.1",
+                "is-falsey-x": "^1.0.1",
+                "is-primitive": "^2.0.0",
+                "normalize-space-x": "^3.0.0",
+                "replace-comments-x": "^2.0.0",
+                "to-boolean-x": "^1.0.1",
+                "to-string-tag-x": "^1.4.2"
+            }
+        },
         "is-gif": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/is-gif/-/is-gif-1.0.0.tgz",
@@ -8416,6 +8209,18 @@
             "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=",
             "dev": true
         },
+        "is-index-x": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/is-index-x/-/is-index-x-1.1.0.tgz",
+            "integrity": "sha512-qULKLMepQLGC8rSVdi8uF2vI4LiDrU9XSDg1D+Aa657GIB7GV1jHpga7uXgQvkt/cpQ5mVBHUFTpSehYSqT6+A==",
+            "requires": {
+                "math-clamp-x": "^1.2.0",
+                "max-safe-integer": "^1.0.1",
+                "to-integer-x": "^3.0.0",
+                "to-number-x": "^2.0.0",
+                "to-string-symbols-supported-x": "^1.0.0"
+            }
+        },
         "is-jpg": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/is-jpg/-/is-jpg-1.0.1.tgz",
@@ -8441,12 +8246,26 @@
                 "xtend": "^4.0.0"
             }
         },
+        "is-nan-x": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/is-nan-x/-/is-nan-x-1.0.3.tgz",
+            "integrity": "sha512-WenNBLVGSZID8shogsB++42vF7gvotCfneXM9KMCAKwNPXa8VfAu/RWwpqvnK7dLOP4Z7uitocb0TZ6rAiOccA=="
+        },
         "is-natural-number": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz",
             "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec=",
             "dev": true
         },
+        "is-nil-x": {
+            "version": "1.4.2",
+            "resolved": "https://registry.npmjs.org/is-nil-x/-/is-nil-x-1.4.2.tgz",
+            "integrity": "sha512-9aDY7ir7IGb5HlgqL+b38v2YMxf8S7MEHHxjHGzUhijg2crq47RKdxL37bS6dU0VN87wy2IBZP4akgQtIXmyvg==",
+            "requires": {
+                "lodash.isnull": "^3.0.0",
+                "validate.io-undefined": "^1.0.3"
+            }
+        },
         "is-number": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
@@ -8477,6 +8296,22 @@
             "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
             "dev": true
         },
+        "is-object-like-x": {
+            "version": "1.7.1",
+            "resolved": "https://registry.npmjs.org/is-object-like-x/-/is-object-like-x-1.7.1.tgz",
+            "integrity": "sha512-89nz+kESAW2Y7udq+PdRX/dZnRN2WP1b19Gdv4OYE1Xjoekn1xf31l0ZPzT40qdPD7I2nveNFm9rxxI0vmnGHA==",
+            "requires": {
+                "is-function-x": "^3.3.0",
+                "is-primitive": "^3.0.0"
+            },
+            "dependencies": {
+                "is-primitive": {
+                    "version": "3.0.1",
+                    "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-3.0.1.tgz",
+                    "integrity": "sha512-GljRxhWvlCNRfZyORiH77FwdFwGcMO620o37EOYC0ORWdq+WYNVqW0w2Juzew4M+L81l6/QS3t5gkkihyRqv9w=="
+                }
+            }
+        },
         "is-odd": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz",
@@ -8556,8 +8391,7 @@
         "is-primitive": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-            "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-            "dev": true
+            "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
         },
         "is-promise": {
             "version": "2.1.0",
@@ -8607,8 +8441,12 @@
         "is-stream": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-            "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-            "dev": true
+            "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+        },
+        "is-string": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.4.tgz",
+            "integrity": "sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ="
         },
         "is-svg": {
             "version": "2.1.0",
@@ -8622,8 +8460,7 @@
         "is-symbol": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
-            "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
-            "dev": true
+            "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI="
         },
         "is-tar": {
             "version": "1.0.0",
@@ -8634,8 +8471,7 @@
         "is-typedarray": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-            "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-            "dev": true
+            "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
         },
         "is-url": {
             "version": "1.2.4",
@@ -8674,10 +8510,9 @@
             "dev": true
         },
         "isarray": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
-            "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
-            "dev": true
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+            "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
         },
         "isexe": {
             "version": "2.0.0",
@@ -8706,7 +8541,6 @@
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
             "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
-            "dev": true,
             "requires": {
                 "node-fetch": "^1.0.1",
                 "whatwg-fetch": ">=0.10.0"
@@ -8715,8 +8549,7 @@
         "isstream": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-            "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-            "dev": true
+            "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
         },
         "isurl": {
             "version": "1.0.0",
@@ -8796,8 +8629,7 @@
         "js-tokens": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-            "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-            "dev": true
+            "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
         },
         "js-yaml": {
             "version": "3.7.0",
@@ -8813,7 +8645,6 @@
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
             "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-            "dev": true,
             "optional": true
         },
         "jsesc": {
@@ -8831,14 +8662,12 @@
         "json-schema": {
             "version": "0.2.3",
             "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-            "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-            "dev": true
+            "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
         },
         "json-schema-traverse": {
             "version": "0.3.1",
             "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-            "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-            "dev": true
+            "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
         },
         "json-stable-stringify": {
             "version": "1.0.1",
@@ -8858,8 +8687,7 @@
         "json-stringify-safe": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-            "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-            "dev": true
+            "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
         },
         "json3": {
             "version": "3.3.2",
@@ -8904,7 +8732,6 @@
             "version": "1.4.1",
             "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
             "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-            "dev": true,
             "requires": {
                 "assert-plus": "1.0.0",
                 "extsprintf": "1.3.0",
@@ -8915,8 +8742,7 @@
                 "assert-plus": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-                    "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-                    "dev": true
+                    "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
                 }
             }
         },
@@ -9073,23 +8899,561 @@
                     "dev": true
                 },
                 "chokidar": {
-                    "version": "2.0.3",
-                    "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz",
-                    "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==",
+                    "version": "2.0.4",
+                    "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+                    "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
                     "dev": true,
                     "requires": {
                         "anymatch": "^2.0.0",
                         "async-each": "^1.0.0",
                         "braces": "^2.3.0",
-                        "fsevents": "^1.1.2",
+                        "fsevents": "^1.2.2",
                         "glob-parent": "^3.1.0",
                         "inherits": "^2.0.1",
                         "is-binary-path": "^1.0.0",
                         "is-glob": "^4.0.0",
+                        "lodash.debounce": "^4.0.8",
                         "normalize-path": "^2.1.1",
                         "path-is-absolute": "^1.0.0",
                         "readdirp": "^2.0.0",
-                        "upath": "^1.0.0"
+                        "upath": "^1.0.5"
+                    },
+                    "dependencies": {
+                        "fsevents": {
+                            "version": "1.2.4",
+                            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
+                            "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
+                            "dev": true,
+                            "optional": true,
+                            "requires": {
+                                "nan": "^2.9.2",
+                                "node-pre-gyp": "^0.10.0"
+                            },
+                            "dependencies": {
+                                "abbrev": {
+                                    "version": "1.1.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "ansi-regex": {
+                                    "version": "2.1.1",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "aproba": {
+                                    "version": "1.2.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "are-we-there-yet": {
+                                    "version": "1.1.4",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "delegates": "^1.0.0",
+                                        "readable-stream": "^2.0.6"
+                                    }
+                                },
+                                "balanced-match": {
+                                    "version": "1.0.0",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "brace-expansion": {
+                                    "version": "1.1.11",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "balanced-match": "^1.0.0",
+                                        "concat-map": "0.0.1"
+                                    }
+                                },
+                                "chownr": {
+                                    "version": "1.0.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "code-point-at": {
+                                    "version": "1.1.0",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "concat-map": {
+                                    "version": "0.0.1",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "console-control-strings": {
+                                    "version": "1.1.0",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "core-util-is": {
+                                    "version": "1.0.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "debug": {
+                                    "version": "2.6.9",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "ms": "2.0.0"
+                                    }
+                                },
+                                "deep-extend": {
+                                    "version": "0.5.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "delegates": {
+                                    "version": "1.0.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "detect-libc": {
+                                    "version": "1.0.3",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "fs-minipass": {
+                                    "version": "1.2.5",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "minipass": "^2.2.1"
+                                    }
+                                },
+                                "fs.realpath": {
+                                    "version": "1.0.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "gauge": {
+                                    "version": "2.7.4",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "aproba": "^1.0.3",
+                                        "console-control-strings": "^1.0.0",
+                                        "has-unicode": "^2.0.0",
+                                        "object-assign": "^4.1.0",
+                                        "signal-exit": "^3.0.0",
+                                        "string-width": "^1.0.1",
+                                        "strip-ansi": "^3.0.1",
+                                        "wide-align": "^1.1.0"
+                                    }
+                                },
+                                "glob": {
+                                    "version": "7.1.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "fs.realpath": "^1.0.0",
+                                        "inflight": "^1.0.4",
+                                        "inherits": "2",
+                                        "minimatch": "^3.0.4",
+                                        "once": "^1.3.0",
+                                        "path-is-absolute": "^1.0.0"
+                                    }
+                                },
+                                "has-unicode": {
+                                    "version": "2.0.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "iconv-lite": {
+                                    "version": "0.4.21",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "safer-buffer": "^2.1.0"
+                                    }
+                                },
+                                "ignore-walk": {
+                                    "version": "3.0.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "minimatch": "^3.0.4"
+                                    }
+                                },
+                                "inflight": {
+                                    "version": "1.0.6",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "once": "^1.3.0",
+                                        "wrappy": "1"
+                                    }
+                                },
+                                "inherits": {
+                                    "version": "2.0.3",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "ini": {
+                                    "version": "1.3.5",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "is-fullwidth-code-point": {
+                                    "version": "1.0.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "number-is-nan": "^1.0.0"
+                                    }
+                                },
+                                "isarray": {
+                                    "version": "1.0.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "minimatch": {
+                                    "version": "3.0.4",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "brace-expansion": "^1.1.7"
+                                    }
+                                },
+                                "minimist": {
+                                    "version": "0.0.8",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "minipass": {
+                                    "version": "2.2.4",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "safe-buffer": "^5.1.1",
+                                        "yallist": "^3.0.0"
+                                    }
+                                },
+                                "minizlib": {
+                                    "version": "1.1.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "minipass": "^2.2.1"
+                                    }
+                                },
+                                "mkdirp": {
+                                    "version": "0.5.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "minimist": "0.0.8"
+                                    }
+                                },
+                                "ms": {
+                                    "version": "2.0.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "needle": {
+                                    "version": "2.2.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "debug": "^2.1.2",
+                                        "iconv-lite": "^0.4.4",
+                                        "sax": "^1.2.4"
+                                    }
+                                },
+                                "node-pre-gyp": {
+                                    "version": "0.10.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "detect-libc": "^1.0.2",
+                                        "mkdirp": "^0.5.1",
+                                        "needle": "^2.2.0",
+                                        "nopt": "^4.0.1",
+                                        "npm-packlist": "^1.1.6",
+                                        "npmlog": "^4.0.2",
+                                        "rc": "^1.1.7",
+                                        "rimraf": "^2.6.1",
+                                        "semver": "^5.3.0",
+                                        "tar": "^4"
+                                    }
+                                },
+                                "nopt": {
+                                    "version": "4.0.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "abbrev": "1",
+                                        "osenv": "^0.1.4"
+                                    }
+                                },
+                                "npm-bundled": {
+                                    "version": "1.0.3",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "npm-packlist": {
+                                    "version": "1.1.10",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "ignore-walk": "^3.0.1",
+                                        "npm-bundled": "^1.0.1"
+                                    }
+                                },
+                                "npmlog": {
+                                    "version": "4.1.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "are-we-there-yet": "~1.1.2",
+                                        "console-control-strings": "~1.1.0",
+                                        "gauge": "~2.7.3",
+                                        "set-blocking": "~2.0.0"
+                                    }
+                                },
+                                "number-is-nan": {
+                                    "version": "1.0.1",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "object-assign": {
+                                    "version": "4.1.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "once": {
+                                    "version": "1.4.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "wrappy": "1"
+                                    }
+                                },
+                                "os-homedir": {
+                                    "version": "1.0.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "os-tmpdir": {
+                                    "version": "1.0.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "osenv": {
+                                    "version": "0.1.5",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "os-homedir": "^1.0.0",
+                                        "os-tmpdir": "^1.0.0"
+                                    }
+                                },
+                                "path-is-absolute": {
+                                    "version": "1.0.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "process-nextick-args": {
+                                    "version": "2.0.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "rc": {
+                                    "version": "1.2.7",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "deep-extend": "^0.5.1",
+                                        "ini": "~1.3.0",
+                                        "minimist": "^1.2.0",
+                                        "strip-json-comments": "~2.0.1"
+                                    },
+                                    "dependencies": {
+                                        "minimist": {
+                                            "version": "1.2.0",
+                                            "bundled": true,
+                                            "dev": true,
+                                            "optional": true
+                                        }
+                                    }
+                                },
+                                "readable-stream": {
+                                    "version": "2.3.6",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "core-util-is": "~1.0.0",
+                                        "inherits": "~2.0.3",
+                                        "isarray": "~1.0.0",
+                                        "process-nextick-args": "~2.0.0",
+                                        "safe-buffer": "~5.1.1",
+                                        "string_decoder": "~1.1.1",
+                                        "util-deprecate": "~1.0.1"
+                                    }
+                                },
+                                "rimraf": {
+                                    "version": "2.6.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "glob": "^7.0.5"
+                                    }
+                                },
+                                "safe-buffer": {
+                                    "version": "5.1.1",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "safer-buffer": {
+                                    "version": "2.1.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "sax": {
+                                    "version": "1.2.4",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "semver": {
+                                    "version": "5.5.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "set-blocking": {
+                                    "version": "2.0.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "signal-exit": {
+                                    "version": "3.0.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "string-width": {
+                                    "version": "1.0.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "code-point-at": "^1.0.0",
+                                        "is-fullwidth-code-point": "^1.0.0",
+                                        "strip-ansi": "^3.0.0"
+                                    }
+                                },
+                                "string_decoder": {
+                                    "version": "1.1.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "safe-buffer": "~5.1.0"
+                                    }
+                                },
+                                "strip-ansi": {
+                                    "version": "3.0.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "ansi-regex": "^2.0.0"
+                                    }
+                                },
+                                "strip-json-comments": {
+                                    "version": "2.0.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "tar": {
+                                    "version": "4.4.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "chownr": "^1.0.1",
+                                        "fs-minipass": "^1.2.5",
+                                        "minipass": "^2.2.4",
+                                        "minizlib": "^1.1.0",
+                                        "mkdirp": "^0.5.0",
+                                        "safe-buffer": "^5.1.1",
+                                        "yallist": "^3.0.2"
+                                    }
+                                },
+                                "util-deprecate": {
+                                    "version": "1.0.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "wide-align": {
+                                    "version": "1.1.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "string-width": "^1.0.2"
+                                    }
+                                },
+                                "wrappy": {
+                                    "version": "1.0.2",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "yallist": {
+                                    "version": "3.0.2",
+                                    "bundled": true,
+                                    "dev": true
+                                }
+                            }
+                        },
+                        "upath": {
+                            "version": "1.1.0",
+                            "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
+                            "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
+                            "dev": true
+                        }
                     }
                 },
                 "expand-brackets": {
@@ -9540,6 +9904,93 @@
                 "invert-kv": "^1.0.0"
             }
         },
+        "level": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/level/-/level-2.1.1.tgz",
+            "integrity": "sha512-jhsItEs/L5bf5ctKsvIPcMzeh4nwXxnL3Tsxm4E9My07jcFfqEYwKP57Y9AZu7tmtECdyK6bvCqoClwuOBuY9w==",
+            "requires": {
+                "level-packager": "^2.0.2",
+                "leveldown": "^2.1.1"
+            }
+        },
+        "level-codec": {
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-7.0.1.tgz",
+            "integrity": "sha512-Ua/R9B9r3RasXdRmOtd+t9TCOEIIlts+TN/7XTT2unhDaL6sJn83S3rUyljbr6lVtw49N3/yA0HHjpV6Kzb2aQ=="
+        },
+        "level-errors": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-1.1.2.tgz",
+            "integrity": "sha512-Sw/IJwWbPKF5Ai4Wz60B52yj0zYeqzObLh8k1Tk88jVmD51cJSKWSYpRyhVIvFzZdvsPqlH5wfhp/yxdsaQH4w==",
+            "requires": {
+                "errno": "~0.1.1"
+            }
+        },
+        "level-iterator-stream": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-2.0.3.tgz",
+            "integrity": "sha512-I6Heg70nfF+e5Y3/qfthJFexhRw/Gi3bIymCoXAlijZdAcLaPuWSJs3KXyTYf23ID6g0o2QF62Yh+grOXY3Rig==",
+            "requires": {
+                "inherits": "^2.0.1",
+                "readable-stream": "^2.0.5",
+                "xtend": "^4.0.0"
+            }
+        },
+        "level-packager": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/level-packager/-/level-packager-2.1.1.tgz",
+            "integrity": "sha512-6l3G6dVkmdvHwOJrEA9d9hL6SSFrzwjQoLP8HsvohOgfY/8Z9LyTKNCM5Gc84wtsUWCuIHu6r+S6WrCtTWUJCw==",
+            "requires": {
+                "encoding-down": "~4.0.0",
+                "levelup": "^2.0.0"
+            }
+        },
+        "level-write-stream": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/level-write-stream/-/level-write-stream-1.0.0.tgz",
+            "integrity": "sha1-P3+7Z5pVE3wP6zA97nZuEu4Twdw=",
+            "requires": {
+                "end-stream": "~0.1.0"
+            }
+        },
+        "leveldown": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/leveldown/-/leveldown-2.1.1.tgz",
+            "integrity": "sha512-JNMCTSchq1YtQLMGePmT07UE7hIIYR4GHpZI7+nUXbM9XgNtRAwcBGhnyJyITwpTILTkUcNPBKZ9lZmTUj2E3g==",
+            "requires": {
+                "abstract-leveldown": "~3.0.0",
+                "bindings": "~1.3.0",
+                "fast-future": "~1.0.2",
+                "nan": "~2.8.0",
+                "prebuild-install": "^2.1.0"
+            },
+            "dependencies": {
+                "abstract-leveldown": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-3.0.0.tgz",
+                    "integrity": "sha512-KUWx9UWGQD12zsmLNj64/pndaz4iJh/Pj7nopgkfDG6RlCcbMZvT6+9l7dchK4idog2Is8VdC/PvNbFuFmalIQ==",
+                    "requires": {
+                        "xtend": "~4.0.0"
+                    }
+                },
+                "nan": {
+                    "version": "2.8.0",
+                    "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
+                    "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo="
+                }
+            }
+        },
+        "levelup": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/levelup/-/levelup-2.0.1.tgz",
+            "integrity": "sha1-PckbPmMtN8nlRiOchkEYsATJ+GA=",
+            "requires": {
+                "deferred-leveldown": "~2.0.2",
+                "level-errors": "~1.1.0",
+                "level-iterator-stream": "~2.0.0",
+                "xtend": "~4.0.0"
+            }
+        },
         "levn": {
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -9550,6 +10001,14 @@
                 "type-check": "~0.3.2"
             }
         },
+        "lie": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
+            "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
+            "requires": {
+                "immediate": "~3.0.5"
+            }
+        },
         "limiter": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.3.tgz",
@@ -9786,6 +10245,12 @@
             "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
             "dev": true
         },
+        "lodash.debounce": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+            "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
+            "dev": true
+        },
         "lodash.defaults": {
             "version": "4.2.0",
             "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
@@ -9825,6 +10290,11 @@
             "integrity": "sha1-+4m2WpqAKBgz8LdHizpRBPiY67M=",
             "dev": true
         },
+        "lodash.isnull": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/lodash.isnull/-/lodash.isnull-3.0.0.tgz",
+            "integrity": "sha1-+vvlnqHcon7teGU0A53YTC4HxW4="
+        },
         "lodash.kebabcase": {
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
@@ -9943,7 +10413,6 @@
             "version": "1.3.1",
             "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
             "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
-            "dev": true,
             "requires": {
                 "js-tokens": "^3.0.0"
             }
@@ -10008,10 +10477,15 @@
             "integrity": "sha1-Wrh60dTB2rjowIu/A37gwZAih88=",
             "dev": true
         },
+        "ltgt": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.0.tgz",
+            "integrity": "sha1-tlul/LNJopkkyOMz98alVi8uSEI="
+        },
         "macaddress": {
-            "version": "0.2.8",
-            "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz",
-            "integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=",
+            "version": "0.2.9",
+            "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.9.tgz",
+            "integrity": "sha512-k4F1JUof6cQXxNFzx3thLby4oJzXTXQueAOOts944Vqizn+Rjc2QNFenT9FJSLU1CH3PmrHRSyZs2E+Cqw+P2w==",
             "dev": true
         },
         "make-dir": {
@@ -10044,12 +10518,40 @@
                 "object-visit": "^1.0.0"
             }
         },
+        "math-clamp-x": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/math-clamp-x/-/math-clamp-x-1.2.0.tgz",
+            "integrity": "sha512-tqpjpBcIf9UulApz3EjWXqTZpMlr2vLN9PryC9ghoyCuRmqZaf3JJhPddzgQpJnKLi2QhoFnvKBFtJekAIBSYg==",
+            "requires": {
+                "to-number-x": "^2.0.0"
+            }
+        },
         "math-expression-evaluator": {
             "version": "1.2.17",
             "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",
             "integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw=",
             "dev": true
         },
+        "math-random": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz",
+            "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=",
+            "dev": true
+        },
+        "math-sign-x": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/math-sign-x/-/math-sign-x-3.0.0.tgz",
+            "integrity": "sha512-OzPas41Pn4d16KHnaXmGxxY3/l3zK4OIXtmIwdhgZsxz4FDDcNnbrABYPg2vGfxIkaT9ezGnzDviRH7RfF44jQ==",
+            "requires": {
+                "is-nan-x": "^1.0.1",
+                "to-number-x": "^2.0.0"
+            }
+        },
+        "max-safe-integer": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/max-safe-integer/-/max-safe-integer-1.0.1.tgz",
+            "integrity": "sha1-84BgvixWPYwC5tSK85Ei/YO29BA="
+        },
         "md5": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz",
@@ -10207,14 +10709,12 @@
         "mime-db": {
             "version": "1.33.0",
             "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
-            "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
-            "dev": true
+            "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="
         },
         "mime-types": {
             "version": "2.1.18",
             "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
             "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
-            "dev": true,
             "requires": {
                 "mime-db": "~1.33.0"
             }
@@ -10228,8 +10728,7 @@
         "mimic-response": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz",
-            "integrity": "sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4=",
-            "dev": true
+            "integrity": "sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4="
         },
         "min-document": {
             "version": "2.19.0",
@@ -10264,8 +10763,7 @@
         "minimist": {
             "version": "0.0.8",
             "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-            "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-            "dev": true
+            "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
         },
         "mississippi": {
             "version": "2.0.0",
@@ -10328,7 +10826,6 @@
             "version": "0.5.1",
             "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
             "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-            "dev": true,
             "requires": {
                 "minimist": "0.0.8"
             }
@@ -10361,8 +10858,7 @@
         "ms": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-            "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-            "dev": true
+            "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         },
         "multicast-dns": {
             "version": "6.2.3",
@@ -10436,6 +10932,11 @@
             "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
             "dev": true
         },
+        "nan-x": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/nan-x/-/nan-x-1.0.2.tgz",
+            "integrity": "sha512-dndRmy03JQEN+Nh6WjQl7/OstIozeEmrtWe4TE7mEqJ8W8oMD8m2tHjsLPWt//e3hLAeRSbs4pxMyc5pk/nCkQ=="
+        },
         "nanomatch": {
             "version": "1.2.9",
             "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz",
@@ -10543,11 +11044,18 @@
                 "lower-case": "^1.1.1"
             }
         },
+        "node-abi": {
+            "version": "2.4.3",
+            "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.4.3.tgz",
+            "integrity": "sha512-b656V5C0628gOOA2kwcpNA/bxdlqYF9FvxJ+qqVX0ctdXNVZpS8J6xEUYir3WAKc7U0BH/NRlSpNbGsy+azjeg==",
+            "requires": {
+                "semver": "^5.4.1"
+            }
+        },
         "node-fetch": {
             "version": "1.7.3",
             "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
             "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
-            "dev": true,
             "requires": {
                 "encoding": "^0.1.11",
                 "is-stream": "^1.0.1"
@@ -10791,6 +11299,11 @@
                 }
             }
         },
+        "noop-logger": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
+            "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI="
+        },
         "nopt": {
             "version": "3.0.6",
             "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
@@ -10827,6 +11340,16 @@
             "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
             "dev": true
         },
+        "normalize-space-x": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/normalize-space-x/-/normalize-space-x-3.0.0.tgz",
+            "integrity": "sha512-tbCJerqZCCHPst4rRKgsTanLf45fjOyeAU5zE3mhDxJtFJKt66q39g2XArWhXelgTFVib8mNBUm6Wrd0LxYcfQ==",
+            "requires": {
+                "cached-constructors-x": "^1.0.0",
+                "trim-x": "^3.0.0",
+                "white-space-x": "^3.0.0"
+            }
+        },
         "normalize-url": {
             "version": "1.9.1",
             "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
@@ -10862,7 +11385,6 @@
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
             "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-            "dev": true,
             "requires": {
                 "are-we-there-yet": "~1.1.2",
                 "console-control-strings": "~1.1.0",
@@ -10888,20 +11410,17 @@
         "number-is-nan": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-            "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-            "dev": true
+            "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
         },
         "oauth-sign": {
             "version": "0.8.2",
             "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-            "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-            "dev": true
+            "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
         },
         "object-assign": {
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-            "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-            "dev": true
+            "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
         },
         "object-component": {
             "version": "0.0.3",
@@ -10968,6 +11487,23 @@
                 }
             }
         },
+        "object-get-own-property-descriptor-x": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/object-get-own-property-descriptor-x/-/object-get-own-property-descriptor-x-3.2.0.tgz",
+            "integrity": "sha512-Z/0fIrptD9YuzN+SNK/1kxAEaBcPQM4gSrtOSMSi9eplnL/AbyQcAyAlreAoAzmBon+DQ1Z+AdhxyQSvav5Fyg==",
+            "requires": {
+                "attempt-x": "^1.1.0",
+                "has-own-property-x": "^3.1.1",
+                "has-symbol-support-x": "^1.4.1",
+                "is-falsey-x": "^1.0.0",
+                "is-index-x": "^1.0.0",
+                "is-primitive": "^2.0.0",
+                "is-string": "^1.0.4",
+                "property-is-enumerable-x": "^1.1.0",
+                "to-object-x": "^1.4.1",
+                "to-property-key-x": "^2.0.1"
+            }
+        },
         "object-keys": {
             "version": "1.0.11",
             "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
@@ -11052,6 +11588,11 @@
             "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
             "dev": true
         },
+        "offcanvas-bootstrap": {
+            "version": "2.5.2",
+            "resolved": "https://registry.npmjs.org/offcanvas-bootstrap/-/offcanvas-bootstrap-2.5.2.tgz",
+            "integrity": "sha512-LlwdfGG6p0Sd35hBmQftxm9R6IHPQddPSbKwPWrGwd2o+phD7SLyXZbhWk9VNiz26uy7J9WiQKLVGWTZGFkgUA=="
+        },
         "on-finished": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
@@ -11071,7 +11612,6 @@
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
             "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-            "dev": true,
             "requires": {
                 "wrappy": "1"
             }
@@ -11176,8 +11716,7 @@
         "os-homedir": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-            "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-            "dev": true
+            "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
         },
         "os-locale": {
             "version": "1.4.0",
@@ -11378,6 +11917,17 @@
                 "trim": "0.0.1"
             }
         },
+        "parse-int-x": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/parse-int-x/-/parse-int-x-2.0.0.tgz",
+            "integrity": "sha512-NIMm52gmd1+0qxJK8lV3OZ4zzWpRH1xcz9xCHXl+DNzddwUdS4NEtd7BmTeK7iCIXoaK5e6BoDMHgieH2eNIhg==",
+            "requires": {
+                "cached-constructors-x": "^1.0.0",
+                "nan-x": "^1.0.0",
+                "to-string-x": "^1.4.2",
+                "trim-left-x": "^3.0.0"
+            }
+        },
         "parse-json": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
@@ -11535,9 +12085,9 @@
             "dev": true
         },
         "performance-now": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-            "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+            "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
             "dev": true
         },
         "phantomjs-prebuilt": {
@@ -13978,6 +14528,235 @@
                 }
             }
         },
+        "pouchdb": {
+            "version": "6.4.3",
+            "resolved": "https://registry.npmjs.org/pouchdb/-/pouchdb-6.4.3.tgz",
+            "integrity": "sha512-uLLFFCOuSJXB+yLBRUBSMbRF0r+Kv8rqNlwsu3W9n4QXJgYUZTbPsixzE4kvY19cyXO1vP93W7nUlOv6Ks8ibA==",
+            "requires": {
+                "argsarray": "0.0.1",
+                "buffer-from": "0.1.1",
+                "clone-buffer": "1.0.0",
+                "debug": "3.1.0",
+                "double-ended-queue": "2.1.0-0",
+                "immediate": "3.0.6",
+                "inherits": "2.0.3",
+                "level": "2.1.1",
+                "level-codec": "7.0.1",
+                "level-write-stream": "1.0.0",
+                "leveldown": "2.1.1",
+                "levelup": "2.0.1",
+                "lie": "3.1.1",
+                "ltgt": "2.2.0",
+                "readable-stream": "1.0.33",
+                "request": "2.83.0",
+                "spark-md5": "3.0.0",
+                "through2": "2.0.3",
+                "uuid": "3.2.1",
+                "vuvuzela": "1.0.3"
+            },
+            "dependencies": {
+                "ajv": {
+                    "version": "5.5.2",
+                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+                    "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+                    "requires": {
+                        "co": "^4.6.0",
+                        "fast-deep-equal": "^1.0.0",
+                        "fast-json-stable-stringify": "^2.0.0",
+                        "json-schema-traverse": "^0.3.0"
+                    }
+                },
+                "assert-plus": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+                    "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+                },
+                "aws-sign2": {
+                    "version": "0.7.0",
+                    "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+                    "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+                },
+                "boom": {
+                    "version": "4.3.1",
+                    "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+                    "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
+                    "requires": {
+                        "hoek": "4.x.x"
+                    }
+                },
+                "buffer-from": {
+                    "version": "0.1.1",
+                    "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-0.1.1.tgz",
+                    "integrity": "sha1-V7GLHaChnsBvM4N6UnWiQjUb114=",
+                    "requires": {
+                        "is-array-buffer-x": "^1.0.13"
+                    }
+                },
+                "cryptiles": {
+                    "version": "3.1.2",
+                    "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+                    "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
+                    "requires": {
+                        "boom": "5.x.x"
+                    },
+                    "dependencies": {
+                        "boom": {
+                            "version": "5.2.0",
+                            "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+                            "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+                            "requires": {
+                                "hoek": "4.x.x"
+                            }
+                        }
+                    }
+                },
+                "debug": {
+                    "version": "3.1.0",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+                    "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+                    "requires": {
+                        "ms": "2.0.0"
+                    }
+                },
+                "form-data": {
+                    "version": "2.3.2",
+                    "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+                    "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
+                    "requires": {
+                        "asynckit": "^0.4.0",
+                        "combined-stream": "1.0.6",
+                        "mime-types": "^2.1.12"
+                    }
+                },
+                "har-schema": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+                    "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+                },
+                "har-validator": {
+                    "version": "5.0.3",
+                    "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+                    "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+                    "requires": {
+                        "ajv": "^5.1.0",
+                        "har-schema": "^2.0.0"
+                    }
+                },
+                "hawk": {
+                    "version": "6.0.2",
+                    "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+                    "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
+                    "requires": {
+                        "boom": "4.x.x",
+                        "cryptiles": "3.x.x",
+                        "hoek": "4.x.x",
+                        "sntp": "2.x.x"
+                    }
+                },
+                "hoek": {
+                    "version": "4.2.1",
+                    "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
+                    "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA=="
+                },
+                "http-signature": {
+                    "version": "1.2.0",
+                    "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+                    "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+                    "requires": {
+                        "assert-plus": "^1.0.0",
+                        "jsprim": "^1.2.2",
+                        "sshpk": "^1.7.0"
+                    }
+                },
+                "performance-now": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+                    "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+                },
+                "readable-stream": {
+                    "version": "1.0.33",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                    "integrity": "sha1-OjYN1mwbHX/UcFOJhg7aHQ9hEmw=",
+                    "requires": {
+                        "core-util-is": "~1.0.0",
+                        "inherits": "~2.0.1",
+                        "isarray": "0.0.1",
+                        "string_decoder": "~0.10.x"
+                    }
+                },
+                "request": {
+                    "version": "2.83.0",
+                    "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
+                    "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
+                    "requires": {
+                        "aws-sign2": "~0.7.0",
+                        "aws4": "^1.6.0",
+                        "caseless": "~0.12.0",
+                        "combined-stream": "~1.0.5",
+                        "extend": "~3.0.1",
+                        "forever-agent": "~0.6.1",
+                        "form-data": "~2.3.1",
+                        "har-validator": "~5.0.3",
+                        "hawk": "~6.0.2",
+                        "http-signature": "~1.2.0",
+                        "is-typedarray": "~1.0.0",
+                        "isstream": "~0.1.2",
+                        "json-stringify-safe": "~5.0.1",
+                        "mime-types": "~2.1.17",
+                        "oauth-sign": "~0.8.2",
+                        "performance-now": "^2.1.0",
+                        "qs": "~6.5.1",
+                        "safe-buffer": "^5.1.1",
+                        "stringstream": "~0.0.5",
+                        "tough-cookie": "~2.3.3",
+                        "tunnel-agent": "^0.6.0",
+                        "uuid": "^3.1.0"
+                    }
+                },
+                "sntp": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
+                    "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
+                    "requires": {
+                        "hoek": "4.x.x"
+                    }
+                },
+                "string_decoder": {
+                    "version": "0.10.31",
+                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                    "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+                }
+            }
+        },
+        "prebuild-install": {
+            "version": "2.5.3",
+            "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.3.tgz",
+            "integrity": "sha512-/rI36cN2g7vDQnKWN8Uzupi++KjyqS9iS+/fpwG4Ea8d0Pip0PQ5bshUNzVwt+/D2MRfhVAplYMMvWLqWrCF/g==",
+            "requires": {
+                "detect-libc": "^1.0.3",
+                "expand-template": "^1.0.2",
+                "github-from-package": "0.0.0",
+                "minimist": "^1.2.0",
+                "mkdirp": "^0.5.1",
+                "node-abi": "^2.2.0",
+                "noop-logger": "^0.1.1",
+                "npmlog": "^4.0.1",
+                "os-homedir": "^1.0.1",
+                "pump": "^2.0.1",
+                "rc": "^1.1.6",
+                "simple-get": "^2.7.0",
+                "tar-fs": "^1.13.0",
+                "tunnel-agent": "^0.6.0",
+                "which-pm-runs": "^1.0.0"
+            },
+            "dependencies": {
+                "minimist": {
+                    "version": "1.2.0",
+                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+                    "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+                }
+            }
+        },
         "prelude-ls": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -14027,8 +14806,7 @@
         "process-nextick-args": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-            "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-            "dev": true
+            "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
         },
         "progress": {
             "version": "2.0.0",
@@ -14040,7 +14818,6 @@
             "version": "7.3.1",
             "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
             "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
-            "dev": true,
             "requires": {
                 "asap": "~2.0.3"
             }
@@ -14055,13 +14832,21 @@
             "version": "15.6.1",
             "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz",
             "integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==",
-            "dev": true,
             "requires": {
                 "fbjs": "^0.8.16",
                 "loose-envify": "^1.3.1",
                 "object-assign": "^4.1.1"
             }
         },
+        "property-is-enumerable-x": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/property-is-enumerable-x/-/property-is-enumerable-x-1.1.0.tgz",
+            "integrity": "sha512-22cKy3w3OpRswU6to9iKWDDlg+F9vF2REcwGlGW23jyLjHb1U/jJEWA44sWupOnkhGfDgotU6Lw+N2oyhNi+5A==",
+            "requires": {
+                "to-object-x": "^1.4.1",
+                "to-property-key-x": "^2.0.1"
+            }
+        },
         "proto-list": {
             "version": "1.2.4",
             "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
@@ -14081,8 +14866,7 @@
         "prr": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-            "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
-            "dev": true
+            "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
         },
         "pseudomap": {
             "version": "1.0.2",
@@ -14107,7 +14891,6 @@
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
             "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-            "dev": true,
             "requires": {
                 "end-of-stream": "^1.1.0",
                 "once": "^1.3.1"
@@ -14127,8 +14910,7 @@
         "punycode": {
             "version": "1.4.1",
             "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-            "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-            "dev": true
+            "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
         },
         "q": {
             "version": "1.5.1",
@@ -14137,10 +14919,9 @@
             "dev": true
         },
         "qs": {
-            "version": "6.2.3",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz",
-            "integrity": "sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=",
-            "dev": true
+            "version": "6.5.2",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+            "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
         },
         "query-string": {
             "version": "4.3.4",
@@ -14171,43 +14952,27 @@
             "dev": true
         },
         "randomatic": {
-            "version": "1.1.7",
-            "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-            "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz",
+            "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
             "dev": true,
             "requires": {
-                "is-number": "^3.0.0",
-                "kind-of": "^4.0.0"
+                "is-number": "^4.0.0",
+                "kind-of": "^6.0.0",
+                "math-random": "^1.0.1"
             },
             "dependencies": {
                 "is-number": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-                    "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "^3.0.2"
-                    },
-                    "dependencies": {
-                        "kind-of": {
-                            "version": "3.2.2",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                            "dev": true,
-                            "requires": {
-                                "is-buffer": "^1.1.5"
-                            }
-                        }
-                    }
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+                    "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+                    "dev": true
                 },
                 "kind-of": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-                    "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-                    "dev": true,
-                    "requires": {
-                        "is-buffer": "^1.1.5"
-                    }
+                    "version": "6.0.2",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+                    "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+                    "dev": true
                 }
             }
         },
@@ -14278,7 +15043,6 @@
             "version": "1.2.8",
             "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
             "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-            "dev": true,
             "requires": {
                 "deep-extend": "^0.6.0",
                 "ini": "~1.3.0",
@@ -14289,8 +15053,7 @@
                 "minimist": {
                     "version": "1.2.0",
                     "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-                    "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-                    "dev": true
+                    "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
                 }
             }
         },
@@ -14306,6 +15069,14 @@
                 "prop-types": "^15.6.0"
             }
         },
+        "react-bootstrap4-form-validation": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/react-bootstrap4-form-validation/-/react-bootstrap4-form-validation-1.0.5.tgz",
+            "integrity": "sha512-xLwJA/tUFBk2JW3zfHEz421qqqCHh4NZlwxJAUqYcrh0HPcWL5jrzfzSYZ5U/RBoAowrd8tLTKRAvboUXQux4Q==",
+            "requires": {
+                "prop-types": "^15.6.1"
+            }
+        },
         "react-deep-force-update": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/react-deep-force-update/-/react-deep-force-update-2.1.1.tgz",
@@ -14408,7 +15179,6 @@
             "version": "2.3.5",
             "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
             "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-            "dev": true,
             "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.3",
@@ -14422,8 +15192,7 @@
                 "isarray": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-                    "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-                    "dev": true
+                    "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
                 }
             }
         },
@@ -14824,6 +15593,15 @@
                 "is-finite": "^1.0.0"
             }
         },
+        "replace-comments-x": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/replace-comments-x/-/replace-comments-x-2.0.0.tgz",
+            "integrity": "sha512-+vMP4jqU+8HboLWms6YMNEiaZG5hh1oR6ENCnGYDF/UQ7aYiJUK/8tcl3+KZAHRCKKa3gqzrfiarlUBHQSgRlg==",
+            "requires": {
+                "require-coercible-to-string-x": "^1.0.0",
+                "to-string-x": "^1.4.2"
+            }
+        },
         "replace-ext": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
@@ -14831,40 +15609,66 @@
             "dev": true
         },
         "request": {
-            "version": "2.81.0",
-            "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-            "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+            "version": "2.87.0",
+            "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
+            "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
             "dev": true,
             "requires": {
-                "aws-sign2": "~0.6.0",
-                "aws4": "^1.2.1",
+                "aws-sign2": "~0.7.0",
+                "aws4": "^1.6.0",
                 "caseless": "~0.12.0",
                 "combined-stream": "~1.0.5",
-                "extend": "~3.0.0",
+                "extend": "~3.0.1",
                 "forever-agent": "~0.6.1",
-                "form-data": "~2.1.1",
-                "har-validator": "~4.2.1",
-                "hawk": "~3.1.3",
-                "http-signature": "~1.1.0",
+                "form-data": "~2.3.1",
+                "har-validator": "~5.0.3",
+                "http-signature": "~1.2.0",
                 "is-typedarray": "~1.0.0",
                 "isstream": "~0.1.2",
                 "json-stringify-safe": "~5.0.1",
-                "mime-types": "~2.1.7",
-                "oauth-sign": "~0.8.1",
-                "performance-now": "^0.2.0",
-                "qs": "~6.4.0",
-                "safe-buffer": "^5.0.1",
-                "stringstream": "~0.0.4",
-                "tough-cookie": "~2.3.0",
+                "mime-types": "~2.1.17",
+                "oauth-sign": "~0.8.2",
+                "performance-now": "^2.1.0",
+                "qs": "~6.5.1",
+                "safe-buffer": "^5.1.1",
+                "tough-cookie": "~2.3.3",
                 "tunnel-agent": "^0.6.0",
-                "uuid": "^3.0.0"
+                "uuid": "^3.1.0"
             },
             "dependencies": {
-                "qs": {
-                    "version": "6.4.0",
-                    "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-                    "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
+                "assert-plus": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+                    "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
                     "dev": true
+                },
+                "aws-sign2": {
+                    "version": "0.7.0",
+                    "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+                    "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+                    "dev": true
+                },
+                "form-data": {
+                    "version": "2.3.2",
+                    "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+                    "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
+                    "dev": true,
+                    "requires": {
+                        "asynckit": "^0.4.0",
+                        "combined-stream": "1.0.6",
+                        "mime-types": "^2.1.12"
+                    }
+                },
+                "http-signature": {
+                    "version": "1.2.0",
+                    "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+                    "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+                    "dev": true,
+                    "requires": {
+                        "assert-plus": "^1.0.0",
+                        "jsprim": "^1.2.2",
+                        "sshpk": "^1.7.0"
+                    }
                 }
             }
         },
@@ -14877,6 +15681,15 @@
                 "throttleit": "^1.0.0"
             }
         },
+        "require-coercible-to-string-x": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/require-coercible-to-string-x/-/require-coercible-to-string-x-1.0.2.tgz",
+            "integrity": "sha512-GZ3BSCL0n/zhho8ITganW9FGPh0Kxhq71nCjck8Qau/30Wf4Po8a3XpQdzEMFiXCwZ/0m0E3lKSdSG8gkcIofQ==",
+            "requires": {
+                "require-object-coercible-x": "^1.4.3",
+                "to-string-x": "^1.4.5"
+            }
+        },
         "require-directory": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -14895,6 +15708,14 @@
             "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
             "dev": true
         },
+        "require-object-coercible-x": {
+            "version": "1.4.3",
+            "resolved": "https://registry.npmjs.org/require-object-coercible-x/-/require-object-coercible-x-1.4.3.tgz",
+            "integrity": "sha512-5wEaS+NIiU5HLJQTqBQ+6XHtX7yplUS374j/H/nRDlc7rMWfENqp026jnUHWAOCZ+ekixkXuFHEnTF28oqqVLA==",
+            "requires": {
+                "is-nil-x": "^1.4.2"
+            }
+        },
         "require-uncached": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
@@ -15076,6 +15897,11 @@
                 "glob": "^7.0.5"
             }
         },
+        "routie": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/routie/-/routie-0.0.1.tgz",
+            "integrity": "sha1-Wfoklzrp40gtQiXvGGcNDYcVV18="
+        },
         "run-async": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
@@ -15118,8 +15944,7 @@
         "safe-buffer": {
             "version": "5.1.1",
             "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-            "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-            "dev": true
+            "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
         },
         "safe-regex": {
             "version": "1.1.0",
@@ -15665,8 +16490,7 @@
         "semver": {
             "version": "5.5.0",
             "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-            "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
-            "dev": true
+            "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
         },
         "semver-regex": {
             "version": "1.0.0",
@@ -15743,35 +16567,18 @@
             "dev": true
         },
         "serve-index": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.8.0.tgz",
-            "integrity": "sha1-fF2WwT+xMRAfk8HFd0+FFqHnjTs=",
+            "version": "1.9.1",
+            "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+            "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
             "dev": true,
             "requires": {
-                "accepts": "~1.3.3",
-                "batch": "0.5.3",
-                "debug": "~2.2.0",
+                "accepts": "~1.3.4",
+                "batch": "0.6.1",
+                "debug": "2.6.9",
                 "escape-html": "~1.0.3",
-                "http-errors": "~1.5.0",
-                "mime-types": "~2.1.11",
-                "parseurl": "~1.3.1"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "2.2.0",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-                    "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-                    "dev": true,
-                    "requires": {
-                        "ms": "0.7.1"
-                    }
-                },
-                "ms": {
-                    "version": "0.7.1",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-                    "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
-                    "dev": true
-                }
+                "http-errors": "~1.6.2",
+                "mime-types": "~2.1.17",
+                "parseurl": "~1.3.2"
             }
         },
         "serve-static": {
@@ -15795,8 +16602,7 @@
         "set-blocking": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-            "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-            "dev": true
+            "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
         },
         "set-immediate-shim": {
             "version": "1.0.1",
@@ -15819,13 +16625,12 @@
         "setimmediate": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-            "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-            "dev": true
+            "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
         },
         "setprototypeof": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz",
-            "integrity": "sha1-gaVSFB7BBLiOic44MQOtXGZWTQg=",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+            "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
             "dev": true
         },
         "shallow-clone": {
@@ -15877,8 +16682,22 @@
         "signal-exit": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-            "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-            "dev": true
+            "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+        },
+        "simple-concat": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz",
+            "integrity": "sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY="
+        },
+        "simple-get": {
+            "version": "2.8.1",
+            "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-2.8.1.tgz",
+            "integrity": "sha512-lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==",
+            "requires": {
+                "decompress-response": "^3.3.0",
+                "once": "^1.3.1",
+                "simple-concat": "^1.0.0"
+            }
         },
         "slash": {
             "version": "1.0.0",
@@ -15903,6 +16722,11 @@
                 }
             }
         },
+        "smooth-scroll": {
+            "version": "14.2.0",
+            "resolved": "https://registry.npmjs.org/smooth-scroll/-/smooth-scroll-14.2.0.tgz",
+            "integrity": "sha512-fspsAb1G36+3nwxRY7Z1NdzioEzpfmczbPYkpkfZZhDRfyTFW6jkf4zuBGfh+RgldfHdhWNE8LMIDO/e/7MRQQ=="
+        },
         "snapdragon": {
             "version": "0.8.2",
             "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -16065,16 +16889,86 @@
             }
         },
         "socket.io": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz",
-            "integrity": "sha1-waRZDO/4fs8TxyZS8Eb3FrKeYBQ=",
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
+            "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
             "dev": true,
             "requires": {
-                "debug": "~2.6.6",
-                "engine.io": "~3.1.0",
+                "debug": "~3.1.0",
+                "engine.io": "~3.2.0",
+                "has-binary2": "~1.0.2",
                 "socket.io-adapter": "~1.1.0",
-                "socket.io-client": "2.0.4",
-                "socket.io-parser": "~3.1.1"
+                "socket.io-client": "2.1.1",
+                "socket.io-parser": "~3.2.0"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "3.1.0",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+                    "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.0.0"
+                    }
+                },
+                "engine.io-client": {
+                    "version": "3.2.1",
+                    "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
+                    "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
+                    "dev": true,
+                    "requires": {
+                        "component-emitter": "1.2.1",
+                        "component-inherit": "0.0.3",
+                        "debug": "~3.1.0",
+                        "engine.io-parser": "~2.1.1",
+                        "has-cors": "1.1.0",
+                        "indexof": "0.0.1",
+                        "parseqs": "0.0.5",
+                        "parseuri": "0.0.5",
+                        "ws": "~3.3.1",
+                        "xmlhttprequest-ssl": "~1.5.4",
+                        "yeast": "0.1.2"
+                    }
+                },
+                "isarray": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+                    "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
+                    "dev": true
+                },
+                "socket.io-client": {
+                    "version": "2.1.1",
+                    "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
+                    "integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
+                    "dev": true,
+                    "requires": {
+                        "backo2": "1.0.2",
+                        "base64-arraybuffer": "0.1.5",
+                        "component-bind": "1.0.0",
+                        "component-emitter": "1.2.1",
+                        "debug": "~3.1.0",
+                        "engine.io-client": "~3.2.0",
+                        "has-binary2": "~1.0.2",
+                        "has-cors": "1.1.0",
+                        "indexof": "0.0.1",
+                        "object-component": "0.0.3",
+                        "parseqs": "0.0.5",
+                        "parseuri": "0.0.5",
+                        "socket.io-parser": "~3.2.0",
+                        "to-array": "0.1.4"
+                    }
+                },
+                "socket.io-parser": {
+                    "version": "3.2.0",
+                    "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
+                    "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==",
+                    "dev": true,
+                    "requires": {
+                        "component-emitter": "1.2.1",
+                        "debug": "~3.1.0",
+                        "isarray": "2.0.1"
+                    }
+                }
             }
         },
         "socket.io-adapter": {
@@ -16124,6 +17018,12 @@
                     "requires": {
                         "ms": "2.0.0"
                     }
+                },
+                "isarray": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+                    "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
+                    "dev": true
                 }
             }
         },
@@ -16193,15 +17093,16 @@
             "dev": true
         },
         "source-map-resolve": {
-            "version": "0.3.1",
-            "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz",
-            "integrity": "sha1-YQ9hIqRFuN1RU1oqcbeD38Ekh2E=",
+            "version": "0.5.2",
+            "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+            "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
             "dev": true,
             "requires": {
-                "atob": "~1.1.0",
-                "resolve-url": "~0.2.1",
-                "source-map-url": "~0.3.0",
-                "urix": "~0.1.0"
+                "atob": "^2.1.1",
+                "decode-uri-component": "^0.2.0",
+                "resolve-url": "^0.2.1",
+                "source-map-url": "^0.4.0",
+                "urix": "^0.1.0"
             }
         },
         "source-map-support": {
@@ -16222,9 +17123,9 @@
             }
         },
         "source-map-url": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz",
-            "integrity": "sha1-fsrxO1e80J2opAxdJp2zN5nUqvk=",
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+            "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
             "dev": true
         },
         "sourcemapped-stacktrace": {
@@ -16244,6 +17145,11 @@
                 }
             }
         },
+        "spark-md5": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.0.tgz",
+            "integrity": "sha1-NyIifFTi+vJLHcbZM8wUTm9xv+8="
+        },
         "sparkles": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
@@ -16389,7 +17295,6 @@
             "version": "1.14.1",
             "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz",
             "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=",
-            "dev": true,
             "requires": {
                 "asn1": "~0.2.3",
                 "assert-plus": "^1.0.0",
@@ -16404,8 +17309,7 @@
                 "assert-plus": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-                    "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-                    "dev": true
+                    "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
                 }
             }
         },
@@ -16613,7 +17517,6 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
             "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-            "dev": true,
             "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -16624,22 +17527,18 @@
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
             "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-            "dev": true,
             "requires": {
                 "safe-buffer": "~5.1.0"
             }
         },
         "stringstream": {
             "version": "0.0.5",
-            "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-            "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-            "dev": true
+            "resolved": ""
         },
         "strip-ansi": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
             "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-            "dev": true,
             "requires": {
                 "ansi-regex": "^2.0.0"
             }
@@ -16728,8 +17627,7 @@
         "strip-json-comments": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-            "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-            "dev": true
+            "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
         },
         "strip-outer": {
             "version": "1.0.1",
@@ -16930,11 +17828,32 @@
                 "inherits": "2"
             }
         },
+        "tar-fs": {
+            "version": "1.16.3",
+            "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.3.tgz",
+            "integrity": "sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==",
+            "requires": {
+                "chownr": "^1.0.1",
+                "mkdirp": "^0.5.1",
+                "pump": "^1.0.0",
+                "tar-stream": "^1.1.2"
+            },
+            "dependencies": {
+                "pump": {
+                    "version": "1.0.3",
+                    "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz",
+                    "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==",
+                    "requires": {
+                        "end-of-stream": "^1.1.0",
+                        "once": "^1.3.1"
+                    }
+                }
+            }
+        },
         "tar-stream": {
             "version": "1.6.1",
             "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.1.tgz",
             "integrity": "sha512-IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA==",
-            "dev": true,
             "requires": {
                 "bl": "^1.0.0",
                 "buffer-alloc": "^1.1.0",
@@ -17020,7 +17939,6 @@
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
             "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-            "dev": true,
             "requires": {
                 "readable-stream": "^2.1.5",
                 "xtend": "~4.0.1"
@@ -17099,11 +18017,15 @@
             "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
             "dev": true
         },
+        "to-boolean-x": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/to-boolean-x/-/to-boolean-x-1.0.3.tgz",
+            "integrity": "sha512-kQiMyJUgFprL8J+0CfgJuaSFKJMs3EvFe27/6aj/hVzVZT0HY4aA1QjPldLNxzBmjhLcapp7CctYHuD8QqtS3g=="
+        },
         "to-buffer": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
-            "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==",
-            "dev": true
+            "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="
         },
         "to-fast-properties": {
             "version": "1.0.3",
@@ -17132,6 +18054,29 @@
                 }
             }
         },
+        "to-integer-x": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/to-integer-x/-/to-integer-x-3.0.0.tgz",
+            "integrity": "sha512-794L2Lpwjtynm7RxahJi2YdbRY75gTxUW27TMuN26UgwPkmJb/+HPhkFEFbz+E4vNoiP0dxq5tq5fkXoXLaK/w==",
+            "requires": {
+                "is-finite-x": "^3.0.2",
+                "is-nan-x": "^1.0.1",
+                "math-sign-x": "^3.0.0",
+                "to-number-x": "^2.0.0"
+            }
+        },
+        "to-number-x": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/to-number-x/-/to-number-x-2.0.0.tgz",
+            "integrity": "sha512-lGOnCoccUoSzjZ/9Uen8TC4+VFaQcFGhTroWTv2tYWxXgyJV1zqAZ8hEIMkez/Eo790fBMOjidTnQ/OJSCvAoQ==",
+            "requires": {
+                "cached-constructors-x": "^1.0.0",
+                "nan-x": "^1.0.0",
+                "parse-int-x": "^2.0.0",
+                "to-primitive-x": "^1.1.0",
+                "trim-x": "^3.0.0"
+            }
+        },
         "to-object-path": {
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
@@ -17141,6 +18086,40 @@
                 "kind-of": "^3.0.2"
             }
         },
+        "to-object-x": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/to-object-x/-/to-object-x-1.5.0.tgz",
+            "integrity": "sha512-AKn5GQcdWky+s20vjWkt+Wa6y3dxQH3yQyMBhOfBOPldUwqwhgvlqcIg5H092ntNc+TX8/Cxzs1kMHH19pyCnA==",
+            "requires": {
+                "cached-constructors-x": "^1.0.0",
+                "require-object-coercible-x": "^1.4.1"
+            }
+        },
+        "to-primitive-x": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/to-primitive-x/-/to-primitive-x-1.1.0.tgz",
+            "integrity": "sha512-gyMY0gi3wjK3e4MUBKqv9Zl8QGcWguIkaUr2VJmoBEsOpDcpDZSEyljR773eVG4maS48uX7muLkoQoh/BA82OQ==",
+            "requires": {
+                "has-symbol-support-x": "^1.4.1",
+                "is-date-object": "^1.0.1",
+                "is-function-x": "^3.2.0",
+                "is-nil-x": "^1.4.1",
+                "is-primitive": "^2.0.0",
+                "is-symbol": "^1.0.1",
+                "require-object-coercible-x": "^1.4.1",
+                "validate.io-undefined": "^1.0.3"
+            }
+        },
+        "to-property-key-x": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/to-property-key-x/-/to-property-key-x-2.0.2.tgz",
+            "integrity": "sha512-YISLpZFYIazNm0P8hLsKEEUEZ3m8U3+eDysJZqTu3+B9tQp+2TrMpaEGT8Agh4fZ5LSoums60/glNEzk5ozqrg==",
+            "requires": {
+                "has-symbol-support-x": "^1.4.1",
+                "to-primitive-x": "^1.1.0",
+                "to-string-x": "^1.4.2"
+            }
+        },
         "to-regex": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
@@ -17195,6 +18174,34 @@
                 }
             }
         },
+        "to-string-symbols-supported-x": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/to-string-symbols-supported-x/-/to-string-symbols-supported-x-1.0.2.tgz",
+            "integrity": "sha512-3MRqhIhSNVDsVAk4M6WNcuBZrAQe54W13xrXX6RzxXS+pA4nj6DQ96RegQS5z9BSNyYbFsBsPvMVDIpP+a/5RA==",
+            "requires": {
+                "cached-constructors-x": "^1.0.2",
+                "has-symbol-support-x": "^1.4.2",
+                "is-symbol": "^1.0.1"
+            }
+        },
+        "to-string-tag-x": {
+            "version": "1.4.3",
+            "resolved": "https://registry.npmjs.org/to-string-tag-x/-/to-string-tag-x-1.4.3.tgz",
+            "integrity": "sha512-5+0EZ6dOVt/XArXmkooxPzWxmOR081HM/uXitUow7h11WYg5pPo15uYqDWuqO7ZY+O3Atn/dG26wcJCK+mFevg==",
+            "requires": {
+                "lodash.isnull": "^3.0.0",
+                "validate.io-undefined": "^1.0.3"
+            }
+        },
+        "to-string-x": {
+            "version": "1.4.5",
+            "resolved": "https://registry.npmjs.org/to-string-x/-/to-string-x-1.4.5.tgz",
+            "integrity": "sha512-5xzlZDyDa9BUWNjNzZzHgKQ95PnV7qjvEhbqpFaj1ixaHgfJXOFaa3xdMJ+WLYd4hhaMJaxt8Pt5uKaWXfruXA==",
+            "requires": {
+                "cached-constructors-x": "^1.0.0",
+                "is-symbol": "^1.0.1"
+            }
+        },
         "toposort": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.6.tgz",
@@ -17205,7 +18212,6 @@
             "version": "2.3.4",
             "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
             "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
-            "dev": true,
             "requires": {
                 "punycode": "^1.4.1"
             }
@@ -17216,6 +18222,16 @@
             "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=",
             "dev": true
         },
+        "trim-left-x": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/trim-left-x/-/trim-left-x-3.0.0.tgz",
+            "integrity": "sha512-+m6cqkppI+CxQBTwWEZliOHpOBnCArGyMnS1WCLb6IRgukhTkiQu/TNEN5Lj2eM9jk8ewJsc7WxFZfmwNpRXWQ==",
+            "requires": {
+                "cached-constructors-x": "^1.0.0",
+                "require-coercible-to-string-x": "^1.0.0",
+                "white-space-x": "^3.0.0"
+            }
+        },
         "trim-newlines": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
@@ -17237,6 +18253,25 @@
             "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
             "dev": true
         },
+        "trim-right-x": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/trim-right-x/-/trim-right-x-3.0.0.tgz",
+            "integrity": "sha512-iIqEsWEbWVodqdixJHi4FoayJkUxhoL4AvSNGp4FF4FfQKRPGizt8++/RnyC9od75y7P/S6EfONoVqP+NddiKA==",
+            "requires": {
+                "cached-constructors-x": "^1.0.0",
+                "require-coercible-to-string-x": "^1.0.0",
+                "white-space-x": "^3.0.0"
+            }
+        },
+        "trim-x": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/trim-x/-/trim-x-3.0.0.tgz",
+            "integrity": "sha512-w8s38RAUScQ6t3XqMkS75iz5ZkIYLQpVnv2lp3IuTS36JdlVzC54oe6okOf4Wz3UH4rr3XAb2xR3kR5Xei82fw==",
+            "requires": {
+                "trim-left-x": "^3.0.0",
+                "trim-right-x": "^3.0.0"
+            }
+        },
         "true-case-path": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.2.tgz",
@@ -17271,7 +18306,6 @@
             "version": "0.6.0",
             "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
             "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-            "dev": true,
             "requires": {
                 "safe-buffer": "^5.0.1"
             }
@@ -17280,7 +18314,6 @@
             "version": "0.14.5",
             "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
             "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-            "dev": true,
             "optional": true
         },
         "type-check": {
@@ -17311,8 +18344,7 @@
         "ua-parser-js": {
             "version": "0.7.12",
             "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.12.tgz",
-            "integrity": "sha1-BMgamb3V3FImPqKdJMa/jUgYpLs=",
-            "dev": true
+            "integrity": "sha1-BMgamb3V3FImPqKdJMa/jUgYpLs="
         },
         "uglify-js": {
             "version": "2.8.29",
@@ -17635,12 +18667,6 @@
             "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
             "dev": true
         },
-        "upath": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/upath/-/upath-1.0.4.tgz",
-            "integrity": "sha512-d4SJySNBXDaQp+DPrziv3xGS6w3d2Xt69FijJr86zMPBy23JEloMCEOUBBzuN7xCtjLCnmB9tI/z7SBCahHBOw==",
-            "dev": true
-        },
         "upper-case": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
@@ -17795,8 +18821,7 @@
         "util-deprecate": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-            "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-            "dev": true
+            "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
         },
         "util.promisify": {
             "version": "1.0.0",
@@ -17815,23 +18840,15 @@
             "dev": true
         },
         "utils-merge": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
-            "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=",
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+            "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
             "dev": true
         },
         "uuid": {
             "version": "3.2.1",
             "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
-            "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==",
-            "dev": true
-        },
-        "uws": {
-            "version": "9.14.0",
-            "resolved": "https://registry.npmjs.org/uws/-/uws-9.14.0.tgz",
-            "integrity": "sha512-HNMztPP5A1sKuVFmdZ6BPVpBQd5bUjNC8EFMFiICK+oho/OQsAJy5hnIx4btMHiOk8j04f/DbIlqnEZ9d72dqg==",
-            "dev": true,
-            "optional": true
+            "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
         },
         "vali-date": {
             "version": "1.0.0",
@@ -17849,6 +18866,11 @@
                 "spdx-expression-parse": "^3.0.0"
             }
         },
+        "validate.io-undefined": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/validate.io-undefined/-/validate.io-undefined-1.0.3.tgz",
+            "integrity": "sha1-fif8uzFbhB54JDQxiXZxkp4gt/Q="
+        },
         "vary": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -17865,7 +18887,6 @@
             "version": "1.10.0",
             "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
             "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-            "dev": true,
             "requires": {
                 "assert-plus": "^1.0.0",
                 "core-util-is": "1.0.2",
@@ -17875,8 +18896,7 @@
                 "assert-plus": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-                    "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-                    "dev": true
+                    "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
                 }
             }
         },
@@ -17988,6 +19008,11 @@
             "integrity": "sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg==",
             "dev": true
         },
+        "vuvuzela": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/vuvuzela/-/vuvuzela-1.0.3.tgz",
+            "integrity": "sha1-O+FF5YJxxzylUnndhR8SpoIRSws="
+        },
         "ware": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz",
@@ -18130,23 +19155,561 @@
                     }
                 },
                 "chokidar": {
-                    "version": "2.0.3",
-                    "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz",
-                    "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==",
+                    "version": "2.0.4",
+                    "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+                    "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
                     "dev": true,
                     "requires": {
                         "anymatch": "^2.0.0",
                         "async-each": "^1.0.0",
                         "braces": "^2.3.0",
-                        "fsevents": "^1.1.2",
+                        "fsevents": "^1.2.2",
                         "glob-parent": "^3.1.0",
                         "inherits": "^2.0.1",
                         "is-binary-path": "^1.0.0",
                         "is-glob": "^4.0.0",
+                        "lodash.debounce": "^4.0.8",
                         "normalize-path": "^2.1.1",
                         "path-is-absolute": "^1.0.0",
                         "readdirp": "^2.0.0",
-                        "upath": "^1.0.0"
+                        "upath": "^1.0.5"
+                    },
+                    "dependencies": {
+                        "fsevents": {
+                            "version": "1.2.4",
+                            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
+                            "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
+                            "dev": true,
+                            "optional": true,
+                            "requires": {
+                                "nan": "^2.9.2",
+                                "node-pre-gyp": "^0.10.0"
+                            },
+                            "dependencies": {
+                                "abbrev": {
+                                    "version": "1.1.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "ansi-regex": {
+                                    "version": "2.1.1",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "aproba": {
+                                    "version": "1.2.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "are-we-there-yet": {
+                                    "version": "1.1.4",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "delegates": "^1.0.0",
+                                        "readable-stream": "^2.0.6"
+                                    }
+                                },
+                                "balanced-match": {
+                                    "version": "1.0.0",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "brace-expansion": {
+                                    "version": "1.1.11",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "balanced-match": "^1.0.0",
+                                        "concat-map": "0.0.1"
+                                    }
+                                },
+                                "chownr": {
+                                    "version": "1.0.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "code-point-at": {
+                                    "version": "1.1.0",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "concat-map": {
+                                    "version": "0.0.1",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "console-control-strings": {
+                                    "version": "1.1.0",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "core-util-is": {
+                                    "version": "1.0.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "debug": {
+                                    "version": "2.6.9",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "ms": "2.0.0"
+                                    }
+                                },
+                                "deep-extend": {
+                                    "version": "0.5.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "delegates": {
+                                    "version": "1.0.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "detect-libc": {
+                                    "version": "1.0.3",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "fs-minipass": {
+                                    "version": "1.2.5",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "minipass": "^2.2.1"
+                                    }
+                                },
+                                "fs.realpath": {
+                                    "version": "1.0.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "gauge": {
+                                    "version": "2.7.4",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "aproba": "^1.0.3",
+                                        "console-control-strings": "^1.0.0",
+                                        "has-unicode": "^2.0.0",
+                                        "object-assign": "^4.1.0",
+                                        "signal-exit": "^3.0.0",
+                                        "string-width": "^1.0.1",
+                                        "strip-ansi": "^3.0.1",
+                                        "wide-align": "^1.1.0"
+                                    }
+                                },
+                                "glob": {
+                                    "version": "7.1.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "fs.realpath": "^1.0.0",
+                                        "inflight": "^1.0.4",
+                                        "inherits": "2",
+                                        "minimatch": "^3.0.4",
+                                        "once": "^1.3.0",
+                                        "path-is-absolute": "^1.0.0"
+                                    }
+                                },
+                                "has-unicode": {
+                                    "version": "2.0.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "iconv-lite": {
+                                    "version": "0.4.21",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "safer-buffer": "^2.1.0"
+                                    }
+                                },
+                                "ignore-walk": {
+                                    "version": "3.0.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "minimatch": "^3.0.4"
+                                    }
+                                },
+                                "inflight": {
+                                    "version": "1.0.6",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "once": "^1.3.0",
+                                        "wrappy": "1"
+                                    }
+                                },
+                                "inherits": {
+                                    "version": "2.0.3",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "ini": {
+                                    "version": "1.3.5",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "is-fullwidth-code-point": {
+                                    "version": "1.0.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "number-is-nan": "^1.0.0"
+                                    }
+                                },
+                                "isarray": {
+                                    "version": "1.0.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "minimatch": {
+                                    "version": "3.0.4",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "brace-expansion": "^1.1.7"
+                                    }
+                                },
+                                "minimist": {
+                                    "version": "0.0.8",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "minipass": {
+                                    "version": "2.2.4",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "safe-buffer": "^5.1.1",
+                                        "yallist": "^3.0.0"
+                                    }
+                                },
+                                "minizlib": {
+                                    "version": "1.1.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "minipass": "^2.2.1"
+                                    }
+                                },
+                                "mkdirp": {
+                                    "version": "0.5.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "minimist": "0.0.8"
+                                    }
+                                },
+                                "ms": {
+                                    "version": "2.0.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "needle": {
+                                    "version": "2.2.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "debug": "^2.1.2",
+                                        "iconv-lite": "^0.4.4",
+                                        "sax": "^1.2.4"
+                                    }
+                                },
+                                "node-pre-gyp": {
+                                    "version": "0.10.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "detect-libc": "^1.0.2",
+                                        "mkdirp": "^0.5.1",
+                                        "needle": "^2.2.0",
+                                        "nopt": "^4.0.1",
+                                        "npm-packlist": "^1.1.6",
+                                        "npmlog": "^4.0.2",
+                                        "rc": "^1.1.7",
+                                        "rimraf": "^2.6.1",
+                                        "semver": "^5.3.0",
+                                        "tar": "^4"
+                                    }
+                                },
+                                "nopt": {
+                                    "version": "4.0.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "abbrev": "1",
+                                        "osenv": "^0.1.4"
+                                    }
+                                },
+                                "npm-bundled": {
+                                    "version": "1.0.3",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "npm-packlist": {
+                                    "version": "1.1.10",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "ignore-walk": "^3.0.1",
+                                        "npm-bundled": "^1.0.1"
+                                    }
+                                },
+                                "npmlog": {
+                                    "version": "4.1.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "are-we-there-yet": "~1.1.2",
+                                        "console-control-strings": "~1.1.0",
+                                        "gauge": "~2.7.3",
+                                        "set-blocking": "~2.0.0"
+                                    }
+                                },
+                                "number-is-nan": {
+                                    "version": "1.0.1",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "object-assign": {
+                                    "version": "4.1.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "once": {
+                                    "version": "1.4.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "wrappy": "1"
+                                    }
+                                },
+                                "os-homedir": {
+                                    "version": "1.0.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "os-tmpdir": {
+                                    "version": "1.0.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "osenv": {
+                                    "version": "0.1.5",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "os-homedir": "^1.0.0",
+                                        "os-tmpdir": "^1.0.0"
+                                    }
+                                },
+                                "path-is-absolute": {
+                                    "version": "1.0.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "process-nextick-args": {
+                                    "version": "2.0.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "rc": {
+                                    "version": "1.2.7",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "deep-extend": "^0.5.1",
+                                        "ini": "~1.3.0",
+                                        "minimist": "^1.2.0",
+                                        "strip-json-comments": "~2.0.1"
+                                    },
+                                    "dependencies": {
+                                        "minimist": {
+                                            "version": "1.2.0",
+                                            "bundled": true,
+                                            "dev": true,
+                                            "optional": true
+                                        }
+                                    }
+                                },
+                                "readable-stream": {
+                                    "version": "2.3.6",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "core-util-is": "~1.0.0",
+                                        "inherits": "~2.0.3",
+                                        "isarray": "~1.0.0",
+                                        "process-nextick-args": "~2.0.0",
+                                        "safe-buffer": "~5.1.1",
+                                        "string_decoder": "~1.1.1",
+                                        "util-deprecate": "~1.0.1"
+                                    }
+                                },
+                                "rimraf": {
+                                    "version": "2.6.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "glob": "^7.0.5"
+                                    }
+                                },
+                                "safe-buffer": {
+                                    "version": "5.1.1",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "safer-buffer": {
+                                    "version": "2.1.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "sax": {
+                                    "version": "1.2.4",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "semver": {
+                                    "version": "5.5.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "set-blocking": {
+                                    "version": "2.0.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "signal-exit": {
+                                    "version": "3.0.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "string-width": {
+                                    "version": "1.0.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "code-point-at": "^1.0.0",
+                                        "is-fullwidth-code-point": "^1.0.0",
+                                        "strip-ansi": "^3.0.0"
+                                    }
+                                },
+                                "string_decoder": {
+                                    "version": "1.1.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "safe-buffer": "~5.1.0"
+                                    }
+                                },
+                                "strip-ansi": {
+                                    "version": "3.0.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "ansi-regex": "^2.0.0"
+                                    }
+                                },
+                                "strip-json-comments": {
+                                    "version": "2.0.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "tar": {
+                                    "version": "4.4.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "chownr": "^1.0.1",
+                                        "fs-minipass": "^1.2.5",
+                                        "minipass": "^2.2.4",
+                                        "minizlib": "^1.1.0",
+                                        "mkdirp": "^0.5.0",
+                                        "safe-buffer": "^5.1.1",
+                                        "yallist": "^3.0.2"
+                                    }
+                                },
+                                "util-deprecate": {
+                                    "version": "1.0.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "wide-align": {
+                                    "version": "1.1.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "string-width": "^1.0.2"
+                                    }
+                                },
+                                "wrappy": {
+                                    "version": "1.0.2",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "yallist": {
+                                    "version": "3.0.2",
+                                    "bundled": true,
+                                    "dev": true
+                                }
+                            }
+                        },
+                        "upath": {
+                            "version": "1.1.0",
+                            "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
+                            "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
+                            "dev": true
+                        }
                     }
                 },
                 "cliui": {
@@ -18909,18 +20472,16 @@
                     "dev": true
                 },
                 "braces": {
-                    "version": "2.3.1",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.1.tgz",
-                    "integrity": "sha512-SO5lYHA3vO6gz66erVvedSCkp7AKWdv6VcQ2N4ysXfPxdAlxAMMAdwegGGcv1Bqwm7naF1hNdk5d6AAIEHV2nQ==",
+                    "version": "2.3.2",
+                    "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+                    "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
                     "dev": true,
                     "requires": {
                         "arr-flatten": "^1.1.0",
                         "array-unique": "^0.3.2",
-                        "define-property": "^1.0.0",
                         "extend-shallow": "^2.0.1",
                         "fill-range": "^4.0.0",
                         "isobject": "^3.0.1",
-                        "kind-of": "^6.0.2",
                         "repeat-element": "^1.1.2",
                         "snapdragon": "^0.8.1",
                         "snapdragon-node": "^2.0.1",
@@ -18928,15 +20489,6 @@
                         "to-regex": "^3.0.1"
                     },
                     "dependencies": {
-                        "define-property": {
-                            "version": "1.0.0",
-                            "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-                            "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-                            "dev": true,
-                            "requires": {
-                                "is-descriptor": "^1.0.0"
-                            }
-                        },
                         "extend-shallow": {
                             "version": "2.0.1",
                             "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
@@ -18955,23 +20507,561 @@
                     "dev": true
                 },
                 "chokidar": {
-                    "version": "2.0.3",
-                    "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz",
-                    "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==",
+                    "version": "2.0.4",
+                    "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+                    "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
                     "dev": true,
                     "requires": {
                         "anymatch": "^2.0.0",
                         "async-each": "^1.0.0",
                         "braces": "^2.3.0",
-                        "fsevents": "^1.1.2",
+                        "fsevents": "^1.2.2",
                         "glob-parent": "^3.1.0",
                         "inherits": "^2.0.1",
                         "is-binary-path": "^1.0.0",
                         "is-glob": "^4.0.0",
+                        "lodash.debounce": "^4.0.8",
                         "normalize-path": "^2.1.1",
                         "path-is-absolute": "^1.0.0",
                         "readdirp": "^2.0.0",
-                        "upath": "^1.0.0"
+                        "upath": "^1.0.5"
+                    },
+                    "dependencies": {
+                        "fsevents": {
+                            "version": "1.2.4",
+                            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
+                            "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
+                            "dev": true,
+                            "optional": true,
+                            "requires": {
+                                "nan": "^2.9.2",
+                                "node-pre-gyp": "^0.10.0"
+                            },
+                            "dependencies": {
+                                "abbrev": {
+                                    "version": "1.1.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "ansi-regex": {
+                                    "version": "2.1.1",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "aproba": {
+                                    "version": "1.2.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "are-we-there-yet": {
+                                    "version": "1.1.4",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "delegates": "^1.0.0",
+                                        "readable-stream": "^2.0.6"
+                                    }
+                                },
+                                "balanced-match": {
+                                    "version": "1.0.0",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "brace-expansion": {
+                                    "version": "1.1.11",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "balanced-match": "^1.0.0",
+                                        "concat-map": "0.0.1"
+                                    }
+                                },
+                                "chownr": {
+                                    "version": "1.0.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "code-point-at": {
+                                    "version": "1.1.0",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "concat-map": {
+                                    "version": "0.0.1",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "console-control-strings": {
+                                    "version": "1.1.0",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "core-util-is": {
+                                    "version": "1.0.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "debug": {
+                                    "version": "2.6.9",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "ms": "2.0.0"
+                                    }
+                                },
+                                "deep-extend": {
+                                    "version": "0.5.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "delegates": {
+                                    "version": "1.0.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "detect-libc": {
+                                    "version": "1.0.3",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "fs-minipass": {
+                                    "version": "1.2.5",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "minipass": "^2.2.1"
+                                    }
+                                },
+                                "fs.realpath": {
+                                    "version": "1.0.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "gauge": {
+                                    "version": "2.7.4",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "aproba": "^1.0.3",
+                                        "console-control-strings": "^1.0.0",
+                                        "has-unicode": "^2.0.0",
+                                        "object-assign": "^4.1.0",
+                                        "signal-exit": "^3.0.0",
+                                        "string-width": "^1.0.1",
+                                        "strip-ansi": "^3.0.1",
+                                        "wide-align": "^1.1.0"
+                                    }
+                                },
+                                "glob": {
+                                    "version": "7.1.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "fs.realpath": "^1.0.0",
+                                        "inflight": "^1.0.4",
+                                        "inherits": "2",
+                                        "minimatch": "^3.0.4",
+                                        "once": "^1.3.0",
+                                        "path-is-absolute": "^1.0.0"
+                                    }
+                                },
+                                "has-unicode": {
+                                    "version": "2.0.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "iconv-lite": {
+                                    "version": "0.4.21",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "safer-buffer": "^2.1.0"
+                                    }
+                                },
+                                "ignore-walk": {
+                                    "version": "3.0.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "minimatch": "^3.0.4"
+                                    }
+                                },
+                                "inflight": {
+                                    "version": "1.0.6",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "once": "^1.3.0",
+                                        "wrappy": "1"
+                                    }
+                                },
+                                "inherits": {
+                                    "version": "2.0.3",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "ini": {
+                                    "version": "1.3.5",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "is-fullwidth-code-point": {
+                                    "version": "1.0.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "number-is-nan": "^1.0.0"
+                                    }
+                                },
+                                "isarray": {
+                                    "version": "1.0.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "minimatch": {
+                                    "version": "3.0.4",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "brace-expansion": "^1.1.7"
+                                    }
+                                },
+                                "minimist": {
+                                    "version": "0.0.8",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "minipass": {
+                                    "version": "2.2.4",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "safe-buffer": "^5.1.1",
+                                        "yallist": "^3.0.0"
+                                    }
+                                },
+                                "minizlib": {
+                                    "version": "1.1.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "minipass": "^2.2.1"
+                                    }
+                                },
+                                "mkdirp": {
+                                    "version": "0.5.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "minimist": "0.0.8"
+                                    }
+                                },
+                                "ms": {
+                                    "version": "2.0.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "needle": {
+                                    "version": "2.2.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "debug": "^2.1.2",
+                                        "iconv-lite": "^0.4.4",
+                                        "sax": "^1.2.4"
+                                    }
+                                },
+                                "node-pre-gyp": {
+                                    "version": "0.10.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "detect-libc": "^1.0.2",
+                                        "mkdirp": "^0.5.1",
+                                        "needle": "^2.2.0",
+                                        "nopt": "^4.0.1",
+                                        "npm-packlist": "^1.1.6",
+                                        "npmlog": "^4.0.2",
+                                        "rc": "^1.1.7",
+                                        "rimraf": "^2.6.1",
+                                        "semver": "^5.3.0",
+                                        "tar": "^4"
+                                    }
+                                },
+                                "nopt": {
+                                    "version": "4.0.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "abbrev": "1",
+                                        "osenv": "^0.1.4"
+                                    }
+                                },
+                                "npm-bundled": {
+                                    "version": "1.0.3",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "npm-packlist": {
+                                    "version": "1.1.10",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "ignore-walk": "^3.0.1",
+                                        "npm-bundled": "^1.0.1"
+                                    }
+                                },
+                                "npmlog": {
+                                    "version": "4.1.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "are-we-there-yet": "~1.1.2",
+                                        "console-control-strings": "~1.1.0",
+                                        "gauge": "~2.7.3",
+                                        "set-blocking": "~2.0.0"
+                                    }
+                                },
+                                "number-is-nan": {
+                                    "version": "1.0.1",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "object-assign": {
+                                    "version": "4.1.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "once": {
+                                    "version": "1.4.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "wrappy": "1"
+                                    }
+                                },
+                                "os-homedir": {
+                                    "version": "1.0.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "os-tmpdir": {
+                                    "version": "1.0.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "osenv": {
+                                    "version": "0.1.5",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "os-homedir": "^1.0.0",
+                                        "os-tmpdir": "^1.0.0"
+                                    }
+                                },
+                                "path-is-absolute": {
+                                    "version": "1.0.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "process-nextick-args": {
+                                    "version": "2.0.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "rc": {
+                                    "version": "1.2.7",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "deep-extend": "^0.5.1",
+                                        "ini": "~1.3.0",
+                                        "minimist": "^1.2.0",
+                                        "strip-json-comments": "~2.0.1"
+                                    },
+                                    "dependencies": {
+                                        "minimist": {
+                                            "version": "1.2.0",
+                                            "bundled": true,
+                                            "dev": true,
+                                            "optional": true
+                                        }
+                                    }
+                                },
+                                "readable-stream": {
+                                    "version": "2.3.6",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "core-util-is": "~1.0.0",
+                                        "inherits": "~2.0.3",
+                                        "isarray": "~1.0.0",
+                                        "process-nextick-args": "~2.0.0",
+                                        "safe-buffer": "~5.1.1",
+                                        "string_decoder": "~1.1.1",
+                                        "util-deprecate": "~1.0.1"
+                                    }
+                                },
+                                "rimraf": {
+                                    "version": "2.6.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "glob": "^7.0.5"
+                                    }
+                                },
+                                "safe-buffer": {
+                                    "version": "5.1.1",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "safer-buffer": {
+                                    "version": "2.1.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "sax": {
+                                    "version": "1.2.4",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "semver": {
+                                    "version": "5.5.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "set-blocking": {
+                                    "version": "2.0.0",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "signal-exit": {
+                                    "version": "3.0.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "string-width": {
+                                    "version": "1.0.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "code-point-at": "^1.0.0",
+                                        "is-fullwidth-code-point": "^1.0.0",
+                                        "strip-ansi": "^3.0.0"
+                                    }
+                                },
+                                "string_decoder": {
+                                    "version": "1.1.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "safe-buffer": "~5.1.0"
+                                    }
+                                },
+                                "strip-ansi": {
+                                    "version": "3.0.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "requires": {
+                                        "ansi-regex": "^2.0.0"
+                                    }
+                                },
+                                "strip-json-comments": {
+                                    "version": "2.0.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "tar": {
+                                    "version": "4.4.1",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "chownr": "^1.0.1",
+                                        "fs-minipass": "^1.2.5",
+                                        "minipass": "^2.2.4",
+                                        "minizlib": "^1.1.0",
+                                        "mkdirp": "^0.5.0",
+                                        "safe-buffer": "^5.1.1",
+                                        "yallist": "^3.0.2"
+                                    }
+                                },
+                                "util-deprecate": {
+                                    "version": "1.0.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true
+                                },
+                                "wide-align": {
+                                    "version": "1.1.2",
+                                    "bundled": true,
+                                    "dev": true,
+                                    "optional": true,
+                                    "requires": {
+                                        "string-width": "^1.0.2"
+                                    }
+                                },
+                                "wrappy": {
+                                    "version": "1.0.2",
+                                    "bundled": true,
+                                    "dev": true
+                                },
+                                "yallist": {
+                                    "version": "3.0.2",
+                                    "bundled": true,
+                                    "dev": true
+                                }
+                            }
+                        },
+                        "upath": {
+                            "version": "1.1.0",
+                            "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
+                            "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
+                            "dev": true
+                        }
                     }
                 },
                 "debug": {
@@ -19403,8 +21493,7 @@
         "whatwg-fetch": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz",
-            "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ=",
-            "dev": true
+            "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ="
         },
         "whet.extend": {
             "version": "0.9.9",
@@ -19427,11 +21516,20 @@
             "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
             "dev": true
         },
+        "which-pm-runs": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz",
+            "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs="
+        },
+        "white-space-x": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/white-space-x/-/white-space-x-3.0.1.tgz",
+            "integrity": "sha512-BwMFXQNPna/4RsNPOgldVYn+FkEv+lc3wUiFzuaW6Z2DH/oSk1UrRD6SBqDgWQO4JU+aBq3PVuPD9Vz0j7mh0w=="
+        },
         "wide-align": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
             "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-            "dev": true,
             "requires": {
                 "string-width": "^1.0.2 || 2"
             }
@@ -19487,8 +21585,7 @@
         "wrappy": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-            "dev": true
+            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
         },
         "write": {
             "version": "0.2.1",
@@ -19499,6 +21596,21 @@
                 "mkdirp": "^0.5.1"
             }
         },
+        "write-stream": {
+            "version": "0.4.3",
+            "resolved": "https://registry.npmjs.org/write-stream/-/write-stream-0.4.3.tgz",
+            "integrity": "sha1-g8yMA0fQr2BXqThitOOuAd5cgcE=",
+            "requires": {
+                "readable-stream": "~0.0.2"
+            },
+            "dependencies": {
+                "readable-stream": {
+                    "version": "0.0.4",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-0.0.4.tgz",
+                    "integrity": "sha1-8y124/uGM0SlSNeZIwBxc2ZbO40="
+                }
+            }
+        },
         "ws": {
             "version": "3.3.3",
             "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
@@ -19559,8 +21671,7 @@
         "xtend": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-            "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-            "dev": true
+            "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
         },
         "y18n": {
             "version": "3.2.1",
diff --git a/package.json b/package.json
index 3b04b79..d8c4b2b 100755
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
         "offcanvas-bootstrap": "^2.5.2",
         "popper.js": "^1.14.3",
         "pouchdb": "^6.4.3",
+        "react-bootstrap4-form-validation": "^1.0.5",
         "routie": "0.0.1",
         "smooth-scroll": "^14.2.0",
         "yarn": "^1.7.0"
@@ -50,7 +51,7 @@
         "babel-preset-es2015": "^6.24.1",
         "babel-preset-react": "^6.24.1",
         "babel-preset-stage-2": "^6.24.1",
-        "browser-sync": "^2.24.4",
+        "browser-sync": "^2.24.5",
         "browser-sync-webpack-plugin": "^1.2.0",
         "copy-webpack-plugin": "^4.3.1",
         "copyfiles": "^1.2.0",
diff --git a/webpack.config.common.js b/webpack.config.common.js
index 12a798e..1a06eaf 100755
--- a/webpack.config.common.js
+++ b/webpack.config.common.js
@@ -123,4 +123,4 @@ module.exports = {
             Tab: 'exports-loader?Tab!bootstrap/js/dist/tab',
         }),
     ],
-};
\ No newline at end of file
+};
diff --git a/webpack.config.prod.js b/webpack.config.prod.js
index 9e3aa15..d0cd4c8 100755
--- a/webpack.config.prod.js
+++ b/webpack.config.prod.js
@@ -14,6 +14,7 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const FaviconsWebpackPlugin = require('favicons-webpack-plugin');
 
 module.exports = merge(common, {
+    devtool: '',
 
     output: {
         path: path.join(__dirname, conf.DIST),
@@ -29,13 +30,13 @@ module.exports = merge(common, {
                 use: [{
                     loader: 'css-loader',
                     options: {
-                        sourceMap: true,
+                        sourceMap: false,
                         minimize: true
                     }
                 }, {
                     loader: 'postcss-loader',
                     options: {
-                        sourceMap: true,
+                        sourceMap: false,
                         plugins: [
                             autoprefixer({
                                 // If we want to use the same browser list for more tools
@@ -57,7 +58,7 @@ module.exports = merge(common, {
                 }, {
                     loader: 'sass-loader',
                     options: {
-                        sourceMap: true
+                        sourceMap: false
                     }
                 }, ]
             })
@@ -96,7 +97,7 @@ module.exports = merge(common, {
         }),
         new webpack.optimize.ModuleConcatenationPlugin(),
         new webpack.optimize.UglifyJsPlugin({
-            sourceMap: true,
+            sourceMap: false,
             comments: false
         }),
         new ExtractTextPlugin({
@@ -122,4 +123,4 @@ module.exports = merge(common, {
             }
         }),
     ],
-});
\ No newline at end of file
+});