diff --git a/.gitignore b/.gitignore
index 649ea31e2e..de636050f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,4 +90,6 @@ out/
 .idea/
 *.iml
 rake.log
-lein.log
\ No newline at end of file
+lein.log
+
+tmp/
diff --git a/.travis.yml b/.travis.yml
index 55cdef7192..15b3564693 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,3 +13,6 @@ script:
 
 before_cache:
  - find $HOME/.m2 -name resolver-status.properties -exec rm {} \;
+ 
+notifications:
+  slack: akvo:ZLetmotGiT22QryK6pR5bnFS
\ No newline at end of file
diff --git a/Dashboard/.babelrc b/Dashboard/.babelrc
new file mode 100644
index 0000000000..d90261d312
--- /dev/null
+++ b/Dashboard/.babelrc
@@ -0,0 +1,42 @@
+  {
+    "plugins": [
+      "transform-class-properties",
+      "transform-es2015-for-of"
+    ],
+    "env": {
+      "development": {
+        "presets": [
+          "env",
+          "react",
+          "react-hmre",
+          "stage-2"
+        ]
+      },
+      "production": {
+        "presets": [
+          [
+            "env",
+            {
+              "targets": {
+                "ie": 9,
+                "uglify": true
+              }
+            }
+          ],
+          "react",
+          "stage-2"
+        ],
+        "plugins": [
+          "transform-react-constant-elements",
+          "transform-react-remove-prop-types"
+        ]
+      },
+      "test": {
+        "presets": [
+          "env",
+          "react",
+          "stage-2"
+        ]
+      }
+    }
+  }
\ No newline at end of file
diff --git a/Dashboard/.eslintrc b/Dashboard/.eslintrc
new file mode 100644
index 0000000000..b47669501f
--- /dev/null
+++ b/Dashboard/.eslintrc
@@ -0,0 +1,83 @@
+{
+  "extends": "airbnb",
+  "parser": "babel-eslint",
+  "env": {
+    "browser": true,
+    "node": true
+  },
+  "plugins": [
+    "react",
+    "babel"
+  ],
+  "parserOptions": {
+    "ecmaFeatures": {
+      "jsx": true
+    }
+  },
+  "rules": {
+    "camelcase": 1,
+    "class-methods-use-this": 1,
+    "comma-dangle": ["error", {
+      "arrays": "always-multiline",
+      "objects": "always-multiline",
+      "imports": "always-multiline",
+      "exports": "never",
+      "functions": "never"
+    }],
+    "func-names": 0,
+    "global-require": 1,
+    "jsx-a11y/no-static-element-interactions": 0,
+    "no-plusplus": 0,
+    "no-underscore-dangle": 0,
+    "prefer-const": 1,
+    "prefer-destructuring": 1,
+    "radix": 1,
+    "react/forbid-prop-types": 0,
+    "react/no-unused-prop-types": 0,
+    "react/no-multi-comp": 0,
+
+    "no-mixed-operators": 1,
+    "no-bitwise": 0,
+    "prefer-spread": 1,
+    "prefer-rest-params": 1,
+    "no-throw-literal": 1,
+    "import/no-extraneous-dependencies": 1,
+    "no-unused-vars": 1,
+    "eqeqeq": 1,
+    "max-len": 1,
+    "no-continue": 1,
+    "no-mixed-spaces-and-tabs": 1,
+    "no-tabs": 1,
+    "no-extend-native": 1,
+    "no-use-before-define": 1,
+    "no-param-reassign": 1,
+    "consistent-return": 1,
+    "no-restricted-globals": 1,
+    "import/no-unresolved": 1,
+    "function-paren-newline": 1,
+    "no-var": 1,
+    "no-lonely-if": 1,
+    "no-useless-escape": 1,
+    "no-useless-concat": 1,
+    "no-irregular-whitespace": 1,
+    "vars-on-top": 1,
+    "new-cap": 1,
+    "no-array-constructor": 1,
+    "no-restricted-syntax": 1,
+    "guard-for-in": 1,
+    "no-empty": 1,
+    "for-direction": 1,
+    "no-shadow": 1,
+    "no-unused-expressions": 1,
+    "no-loop-func": 1
+  },
+  "globals": {
+    "window": true,
+    "document": true,
+    "FLOW": true,
+    "Ember": true,
+    "$": true,
+    "jQuery": true,
+    "DS": true
+  }
+}
diff --git a/Dashboard/Assetfile b/Dashboard/Assetfile
index 6a41bbe52a..5597e3f928 100644
--- a/Dashboard/Assetfile
+++ b/Dashboard/Assetfile
@@ -17,115 +17,6 @@ class LoaderFilter < WebFilters::MinispadeFilter
   end
 end
 
-class EmberAssertFilter < Filter
-  def generate_output(inputs, output)
-    inputs.each do |input|
-      result = input.read
-      result.gsub!(/ember_assert\((.*)\);/, '')
-      output.write(result)
-    end
-  end
-end
-
-class HandlebarsFilter < Filter
-  def generate_output(inputs, output)
-    inputs.each do |input|
-      code = input.read.to_json
-      name = File.basename(input.path, '.handlebars')
-      output.write "\nreturn Ember.Handlebars.compile(#{code});\n"
-    end
-  end
-end
-
-class CSSMinFilter < Filter
-  def generate_output(inputs, output)
-    inputs.each do |input|
-      result = input.read
-      result.gsub!(/href="css\/(.*)\.css"/, 'href="css/\1.min.css"') # index.html
-      result.gsub!(/url\("(.*?).css"\)/, 'url("\1.min.css")') # screen.css
-      output.write(result)
-    end
-  end
-end
-
-output '../GAE/target/akvo-flow/admin'
-input 'app' do
-
-  match 'css/main.scss' do
-    scss
-  end
-
-  match 'css/users.scss' do
-    scss
-  end
-
-  match 'dashboard.html' do
-    if ENV['RAKEP_MODE'] == 'production'
-      filter CSSMinFilter
-    end
-    copy 'index.html'
-  end
-
-  match 'js/lib/**/*.js' do
-    filter LoaderFilter,
-      :module_id_generator => proc { |input|
-        input.path.sub(/^js\/lib\//, "#{APPNAME}/").sub(/\.js$/, '')
-      }
-
-    if ENV['RAKEP_MODE'] == 'production'
-      filter EmberAssertFilter
-      uglify {|input| input}
-    end
-    concat 'js/app.js'
-  end
-
-  match 'js/plugins/**/*.js' do
-    if ENV['RAKEP_MODE'] == 'production'
-      uglify {|input| input}
-    end
-    concat do |input|
-      input.sub(/plugins\//, '')
-    end
-  end
-
-  match 'js/templates/**/*.handlebars' do
-    filter HandlebarsFilter
-    filter LoaderFilter,
-      :module_id_generator => proc { |input|
-        input.path.sub(/^js\/templates\//, "#{APPNAME}/templates/").sub(/\.handlebars$/, '')
-      }
-    if ENV['RAKEP_MODE'] == 'production'
-      uglify {|input| input}
-    end
-    concat 'js/app.js'
-  end
-
-
-  match "static/**/*" do
-    concat do |input|
-      input.sub(/static\//, '')
-    end
-  end
-
-  match "css/custom-theme/images/*" do
-    concat do |input|
-      input.sub(/static\//, '')
-    end
-  end  
-
-  match "css/**/*.css" do
-    if ENV['RAKEP_MODE'] == 'production'
-      yui_css
-      filter CSSMinFilter
-    else
-      concat do |input|
-        input
-      end
-    end
-  end
-
-end
-
 output '../GAE/target/akvo-flow/vendorjs'
 input 'app' do
   match "js/vendor/**/*.js" do
diff --git a/Dashboard/AssetfilePublic b/Dashboard/AssetfilePublic
deleted file mode 100755
index e1b795e489..0000000000
--- a/Dashboard/AssetfilePublic
+++ /dev/null
@@ -1,155 +0,0 @@
-APPNAME = 'akvo-flow'
-
-require 'json'
-require 'rake-pipeline-web-filters'
-
-WebFilters = Rake::Pipeline::Web::Filters
-
-class LoaderFilter < WebFilters::MinispadeFilter
-  def generate_output(inputs, output)
-    inputs.each do |input|
-      code = input.read
-      module_id = @module_id_generator.call(input)
-      contents = "function(require) {\n#{code}\n}"
-      ret = "\nloader.register('#{module_id}', #{contents});\n"
-      output.write ret
-    end
-  end
-end
-
-class EmberAssertFilter < Filter
-  def generate_output(inputs, output)
-    inputs.each do |input|
-      result = input.read
-      result.gsub!(/ember_assert\((.*)\);/, '')
-      output.write(result)
-    end
-  end
-end
-
-class HandlebarsFilter < Filter
-  def generate_output(inputs, output)
-    inputs.each do |input|
-      code = input.read.to_json
-      name = File.basename(input.path, '.handlebars')
-      output.write "\nreturn Ember.Handlebars.compile(#{code});\n"
-    end
-  end
-end
-
-class CSSMinFilter < Filter
-  def generate_output(inputs, output)
-    inputs.each do |input|
-      result = input.read
-      result.gsub!(/href="\/publicmap\/css\/(.*)\.css"/, 'href="/publicmap/css/\1.min.css"') # index.html
-      result.gsub!(/url\("(.*?).css"\)/, 'url("\1.min.css")') # screen.css
-      output.write(result)
-    end
-  end
-end
-
-output '../GAE/target/akvo-flow/publicmap'
-input 'app' do
-
-  match 'css/main.scss' do
-    scss
-  end
-
-  match 'public.html' do
-    if ENV['RAKEP_MODE'] == 'production'
-      filter CSSMinFilter
-    end
-    copy '../index.html'
-  end
-
-  match 'js/lib/**/*public.js' do
-    filter LoaderFilter,
-      :module_id_generator => proc { |input|
-        input.path.sub(/^js\/lib\//, "#{APPNAME}/").sub(/\.js$/, '')
-      }
-
-    if ENV['RAKEP_MODE'] == 'production'
-      filter EmberAssertFilter
-      uglify {|input| input}
-    end
-    concat 'js/app.js'
-  end
-
-  match 'js/lib/**/*common.js' do
-    filter LoaderFilter,
-      :module_id_generator => proc { |input|
-        input.path.sub(/^js\/lib\//, "#{APPNAME}/").sub(/\.js$/, '')
-      }
-
-    if ENV['RAKEP_MODE'] == 'production'
-      filter EmberAssertFilter
-      uglify {|input| input}
-    end
-    concat 'js/app.js'
-  end
-
-  match 'js/plugins/**/*.js' do
-    if ENV['RAKEP_MODE'] == 'production'
-      uglify {|input| input}
-    end
-    concat do |input|
-      input.sub(/plugins\//, '')
-    end
-  end
-
-  match 'js/templates/**/*-common.handlebars' do
-    filter HandlebarsFilter
-    filter LoaderFilter,
-      :module_id_generator => proc { |input|
-        input.path.sub(/^js\/templates\//, "#{APPNAME}/templates/").sub(/\.handlebars$/, '')
-      }
-    if ENV['RAKEP_MODE'] == 'production'
-      uglify {|input| input}
-    end
-    concat 'js/app.js'
-  end
-
-  match 'js/templates/**/*-public.handlebars' do
-    filter HandlebarsFilter
-    filter LoaderFilter,
-      :module_id_generator => proc { |input|
-        input.path.sub(/^js\/templates\//, "#{APPNAME}/templates/").sub(/\.handlebars$/, '')
-      }
-    if ENV['RAKEP_MODE'] == 'production'
-      uglify {|input| input}
-    end
-    concat 'js/app.js'
-  end
-
-  match "static/**/*" do
-    concat do |input|
-      input.sub(/static\//, '')
-    end
-  end
-
-  match "css/custom-theme/images/*" do
-    concat do |input|
-      input.sub(/static\//, '')
-    end
-  end  
-
-  match "css/**/*.css" do
-    if ENV['RAKEP_MODE'] == 'production'
-      yui_css
-      filter CSSMinFilter
-    else
-      concat do |input|
-        input
-      end
-    end
-  end
-
-  # match "js/vendor/**/*.js" do
-  #  concat do |input|
-  #    input
-  #  end
-  # end
-
-end
-
-# vim: filetype=ruby
diff --git a/Dashboard/Rakefile b/Dashboard/Rakefile
index c3ad15a904..fad31a1e39 100755
--- a/Dashboard/Rakefile
+++ b/Dashboard/Rakefile
@@ -9,10 +9,6 @@ def pipeline
   Rake::Pipeline::Project.new('Assetfile')
 end
 
-def pipeline_public
-  Rake::Pipeline::Project.new('AssetfilePublic')
-end
-
 desc "Clean #{APPNAME}"
 task :clean do
   pipeline.clean
@@ -22,7 +18,6 @@ end
 desc "Build #{APPNAME}"
 task :build => :clean do
   pipeline.invoke
-  pipeline_public.invoke
 end
 
 desc "Watch for changes"
diff --git a/Dashboard/app/css/form.scss b/Dashboard/app/css/form.scss
index bb06cd1506..63b3b324b5 100644
--- a/Dashboard/app/css/form.scss
+++ b/Dashboard/app/css/form.scss
@@ -122,14 +122,14 @@ input[type="search"] {
     box-sizing: content-box;
     padding: 5px 25px 3px 4px;
     border: 1px solid rgb(218, 218, 218);
-    background: rgb(255, 255, 255) url(../images/search-icon.png) no-repeat 3px right;
+    background: rgb(255, 255, 255) url(/admin/images/search-icon.png) no-repeat 3px right;
     &:hover {
         border: 1px solid rgb(114, 205, 255);
-        background: rgb(224, 224, 224) url(../images/search-icon.png) no-repeat top right;
+        background: rgb(224, 224, 224) url(/admin/images/search-icon.png) no-repeat top right;
     }
     &:focus {
         border: 1px solid rgb(123, 123, 123);
-        background: rgb(244, 244, 244) url(../images/search-icon.png) no-repeat top right;
+        background: rgb(244, 244, 244) url(/admin/images/search-icon.png) no-repeat top right;
     }
 }
 
diff --git a/Dashboard/app/css/main.scss b/Dashboard/app/css/main.scss
index 8c4f4f3ad3..aebb5ca7e2 100644
--- a/Dashboard/app/css/main.scss
+++ b/Dashboard/app/css/main.scss
@@ -155,7 +155,7 @@ pre {
         border-radius: 3px;
         box-shadow: 0 5px 8px rgba(212, 212, 212, 0.5);
         padding: 5px 3px 5px 25px;
-        background: rgb(248, 248, 248) url(../images/loader.gif) 5px center no-repeat;
+        background: rgb(248, 248, 248) url(/admin/images/loader.gif) 5px center no-repeat;
         color: rgb(252, 159, 0);
     }
 }
@@ -267,7 +267,7 @@ a, a:link, a:visited {
     &.AddBtn {
         display: inline-block !important;
         padding: 1em 1% 0.8em 1.5em;
-        background: url(../images/addbtn.png) left center no-repeat;
+        background: url(/admin/images/addbtn.png) left center no-repeat;
         color: rgb(0, 123, 182);
         text-align: left;
         font-size: 1.1em;
@@ -281,11 +281,11 @@ a, a:link, a:visited {
         width: 20px;
         height: 16px;
         border-radius: 6px;
-        background: url(../images/closeDialog.png) center top no-repeat;
+        background: url(/admin/images/closeDialog.png) center top no-repeat;
         text-indent: -9999px;
         -o-border-radius: 6px;
         &:hover {
-            background: url(../images/closeDialog.png) center bottom no-repeat;
+            background: url(/admin/images/closeDialog.png) center bottom no-repeat;
         }
     }
 }
@@ -551,7 +551,7 @@ header.top {
         left: 0px;
         height: 40px;
         width: 145px;
-        background: url(../images/akvoFlowLogo.svg) no-repeat 5px top;
+        background: url(/admin/images/akvoFlowLogo.svg) no-repeat 5px top;
         text-indent: -9999px;
         background-size: 90% auto;
     }
@@ -786,7 +786,7 @@ table.dataTable {
             position: relative;
             padding: 9px 1em 9px 1em;
             border-right: thin solid white;
-            background: url(../images/sortTableArrows.png) right center no-repeat;
+            background: url(/admin/images/sortTableArrows.png) right center no-repeat;
             text-align: center;
             font-weight: normal;
             color: $linkColor;
@@ -847,11 +847,11 @@ table.dataTable thead tr th a.helpIcon {
 }
 
 table.dataTable thead tr th.sorting_desc {
-    background: url(../images/sortTableDown.png) right center no-repeat;
+    background: url(/admin/images/sortTableDown.png) right center no-repeat;
 }
 
 table.dataTable thead tr th.sorting_asc {
-    background: url(../images/sortTableUp.png) right center no-repeat;
+    background: url(/admin/images/sortTableUp.png) right center no-repeat;
 }
 
 table.dataTable thead tr th:last-child {
@@ -912,7 +912,7 @@ tfoot tr {
 }
 
 .greyBg a.standardBtn {
-    background-image: url("../images/addPlus.png") left center no-repeat;
+    background-image: url("/admin/images/addPlus.png") left center no-repeat;
 }
 
 @mixin disabledMix {
@@ -1139,11 +1139,11 @@ input.hasDatepicker {
     margin: 3px auto;
     padding: 0;
     width: 99%;
-    background: rgb(242, 242, 242) url(../images/FieldSetSep.png) center center no-repeat;
+    background: rgb(242, 242, 242) url(/admin/images/FieldSetSep.png) center center no-repeat;
 }
 
 .fieldSetWrap.makeWhite {
-    background: white url(../images/FieldSetSep.png) center center no-repeat;
+    background: white url(/admin/images/FieldSetSep.png) center center no-repeat;
 }
 
 #assignSurveys .fieldSetWrap fieldset table {
@@ -1384,11 +1384,11 @@ nav.menuGroupWrap {
             width: calc(98%-30px);
             border-bottom: thin solid rgb(55, 55, 55);
             background: rgb(70, 70, 70);
-            background: rgba(255, 255, 255, 0.05) url(../images/selectFolder.svg) 2px center no-repeat;
+            background: rgba(255, 255, 255, 0.05) url(/admin/images/selectFolder.svg) 2px center no-repeat;
             background-size: 20px 20px;
             div.edit {
                 position: absolute;
-                background: url(../images/IconEditGrey.svg) center center no-repeat;
+                background: url(/admin/images/IconEditGrey.svg) center center no-repeat;
                 background-size: 20px 20px;
                 width: 25px;
                 height: 25px;
@@ -1399,7 +1399,7 @@ nav.menuGroupWrap {
             }
             div.trashFolder {
                 position: absolute;
-                background: url(../images/IconTrashGrey.svg) center center no-repeat;
+                background: url(/admin/images/IconTrashGrey.svg) center center no-repeat;
                 background-size: 20px 20px;
                 width: 25px;
                 height: 25px;
@@ -1410,7 +1410,7 @@ nav.menuGroupWrap {
             }
             div.copyFolder {
                 position: absolute;
-                background: url(../images/IconCopyGrey.svg) center center no-repeat;
+                background: url(/admin/images/IconCopyGrey.svg) center center no-repeat;
                 background-size: 20px 20px;
                 width: 25px;
                 height: 25px;
@@ -1421,11 +1421,11 @@ nav.menuGroupWrap {
             }
             &.folderUp {
                 background: rgb(70, 70, 70);
-                background: url(../images/folderUp.svg) 2px center no-repeat;
+                background: url(/admin/images/folderUp.svg) 2px center no-repeat;
                 background-size: 35px 35px;
                 &:hover {
                     background: rgb(70, 70, 70);
-                    background: rgba(255, 255, 255, 0.05) url(../images/folderUpHover.svg) 2px center no-repeat;
+                    background: rgba(255, 255, 255, 0.05) url(/admin/images/folderUpHover.svg) 2px center no-repeat;
                     background-size: 35px 35px;
                 }
                 a {
@@ -1441,11 +1441,11 @@ nav.menuGroupWrap {
             }
             &.current {
                 border-bottom: thin solid rgb(55, 55, 55);
-                background: rgb(90, 90, 90) url(../images/selectFolder.svg) left center no-repeat;
-                background: rgba(255, 255, 255, 0.15) url(../images/selectFolder.svg) 2px center no-repeat;
+                background: rgb(90, 90, 90) url(/admin/images/selectFolder.svg) left center no-repeat;
+                background: rgba(255, 255, 255, 0.15) url(/admin/images/selectFolder.svg) 2px center no-repeat;
                 background-size: 20px 20px;
                 a, a:hover {
-                    background: url(../images/carretFolderSelected.svg) right center no-repeat;
+                    background: url(/admin/images/carretFolderSelected.svg) right center no-repeat;
                     color: $flowAnchorLinkHover;
                     background-size: 15px 25px;
                 }
@@ -1455,15 +1455,15 @@ nav.menuGroupWrap {
                 padding: 10px 10% 10px 2%;
                 width: 93%;
                 height: 23px;
-                background: url(../images/carretFolder.svg) right center no-repeat;
+                background: url(/admin/images/carretFolder.svg) right center no-repeat;
                 background-size: 15px 25px;
                 color: rgb(153, 153, 153);
                 color: rgba(255, 255, 255, 0.6);
                 @include noWrapTxt;
                 cursor: pointer;
                 &:hover {
-                    background: rgb(80, 80, 80) url(../images/carretFolder.svg) right center no-repeat;
-                    background: rgba(255, 255, 255, 0.05) url(../images/carretFolder.svg) right center no-repeat;
+                    background: rgb(80, 80, 80) url(/admin/images/carretFolder.svg) right center no-repeat;
+                    background: rgba(255, 255, 255, 0.05) url(/admin/images/carretFolder.svg) right center no-repeat;
                     color: rgb(114, 205, 255);
                     background-size: 15px 25px;
                 }
@@ -1499,16 +1499,16 @@ nav.menuGroupWrap {
         transition: background 0.4s ease-in;
         &.scrollUp {
             border-radius: 5px 5px 0 0;
-            background: rgb(31, 31, 31) url(../images/scrollUp.png) center center no-repeat;
+            background: rgb(31, 31, 31) url(/admin/images/scrollUp.png) center center no-repeat;
             &:hover {
-                background: rgb(107, 134, 141) url(../images/scrollUp.png) center center no-repeat;
+                background: rgb(107, 134, 141) url(/admin/images/scrollUp.png) center center no-repeat;
             }
         }
         &.scrollDown {
             border-radius: 0 0 5px 5px;
-            background: rgb(31, 31, 31) url(../images/scrollDown.png) center center no-repeat;
+            background: rgb(31, 31, 31) url(/admin/images/scrollDown.png) center center no-repeat;
             &:hover {
-                background: rgb(107, 134, 141) url(../images/scrollDown.png) center center no-repeat;
+                background: rgb(107, 134, 141) url(/admin/images/scrollDown.png) center center no-repeat;
             }
         }
     }
@@ -1748,13 +1748,13 @@ section.topBar {
                 &.homeRoot {
                     border-radius: 3px 0 0 3px;
                     width: 40px;
-                    background: url(../images/breadCrumb-Root.png) center center no-repeat $akvoLightBlue;
+                    background: url(/admin/images/breadCrumb-Root.png) center center no-repeat $akvoLightBlue;
                     background-size: 60%;
                     text-indent: -9999px;
                     z-index: 9999;
                     margin-left: 0;
                     &:hover {
-                        background: url(../images/breadCrumb-Root.png) center center no-repeat $flowAnchorLinkHover;
+                        background: url(/admin/images/breadCrumb-Root.png) center center no-repeat $flowAnchorLinkHover;
                         background-size: 60%;
                     }
                 }
@@ -1772,7 +1772,7 @@ section.topBar {
                         padding-right: 0;
                         border-radius: 3px 0 0 3px;
                         width: 40px;
-                        background: url(../images/breadCrumb-Root.png) center center no-repeat $akvoLightBlue;
+                        background: url(/admin/images/breadCrumb-Root.png) center center no-repeat $akvoLightBlue;
                         text-indent: -9999px;
                         z-index: 9999;
                         margin-left: 0;
@@ -1792,7 +1792,7 @@ section.topBar {
                             z-index: 10;
                         }
                         &:hover {
-                            background: url(../images/breadCrumb-Root.png) center center no-repeat $akvoLightBlue;
+                            background: url(/admin/images/breadCrumb-Root.png) center center no-repeat $akvoLightBlue;
                         }
                     }
                     &:after {
@@ -1815,7 +1815,7 @@ section.topBar {
                 padding: 0;
                 &.actionTitleEdit {
                     padding: 5px 5px 5px 15px;
-                    background: url(../images/IconEditGreyLight.svg) left center no-repeat;
+                    background: url(/admin/images/IconEditGreyLight.svg) left center no-repeat;
                     background-size: 15px;
                 }
             }
@@ -2044,22 +2044,22 @@ li.aFolder {
     a.editFolderName {
         display: inline-block;
         width: 30px;
-        background: url(../images/IconEditGreyLight.svg) center center no-repeat;
+        background: url(/admin/images/IconEditGreyLight.svg) center center no-repeat;
         background-size: 25px;
         text-indent: -9999px;
         opacity: 0.5;
         &:hover {
-            background: url(../images/IconEditOrange.svg) center center no-repeat;
+            background: url(/admin/images/IconEditOrange.svg) center center no-repeat;
             background-size: 25px;
             opacity: 1;
         }
     }
     a.editingFolderName {
         @extend .editFolderName;
-        background: url(../images/IconSave.svg) center center no-repeat;
+        background: url(/admin/images/IconSave.svg) center center no-repeat;
         background-size: 70px 70px;
         &:hover {
-            background: url(../images/IconSaveOrange.svg) center center no-repeat;
+            background: url(/admin/images/IconSaveOrange.svg) center center no-repeat;
             background-size: 70px 70px;
             opacity: 1;
         }
@@ -2071,7 +2071,7 @@ li.aFolder {
         padding-bottom: 10px;
         h2 {
             color: rgba($akvoBlack, 0.7);
-            background: url(../images/folderIcn.svg) right center no-repeat;
+            background: url(/admin/images/folderIcn.svg) right center no-repeat;
             display: inline;
             width: initial;
             padding-right: 45px;
@@ -2086,7 +2086,7 @@ li.aFolder {
     }
     &.folderEmpty {
         h2 {
-            background: url(../images/folderIcnEmpty.svg) right center no-repeat;
+            background: url(/admin/images/folderIcnEmpty.svg) right center no-repeat;
         }
     }
 }
@@ -2223,7 +2223,7 @@ ul.surveyInfo li.responseNumber {
     -moz-animation: appearFx 2s linear  1 normal forwards;
     -o-animation: appearFx 2s linear 1 normal forwards;
     animation: appearFx 2s linear 1 normal forwards;
-    background-image: url(../images/carret.svg);
+    background-image: url(/admin/images/carret.svg);
     background-position: right center;
     background-repeat: no-repeat;
 }
@@ -2473,24 +2473,24 @@ div.published {
 }
 
 a.publishProjectBtn {
-    background: $flowAnchorLink url(../images/IconPublishWhite.svg) left center no-repeat;
+    background: $flowAnchorLink url(/admin/images/IconPublishWhite.svg) left center no-repeat;
     background-size: 55px 55px;
     padding: 10px 15px 10px 45px;
     color: white;
     border-radius: 3px;
     &.noChanges {
-        background: rgba(32, 32, 36, 0.1) url(../images/IconPublishWhite.svg) left center no-repeat;
+        background: rgba(32, 32, 36, 0.1) url(/admin/images/IconPublishWhite.svg) left center no-repeat;
         background-size: 55px 55px;
         padding: 10px 15px 10px 45px;
         color: white;
         cursor: text;
         &:hover {
-            background: rgba(32, 32, 36, 0.1) url(../images/IconPublishWhite.svg) left center no-repeat;
+            background: rgba(32, 32, 36, 0.1) url(/admin/images/IconPublishWhite.svg) left center no-repeat;
             background-size: 55px 55px;
         }
     }
     &:hover {
-        background: $flowAnchorLinkHover url(../images/IconPublishWhite.svg) left center no-repeat;
+        background: $flowAnchorLinkHover url(/admin/images/IconPublishWhite.svg) left center no-repeat;
         background-size: 55px 55px;
         color: white;
     }
@@ -2619,7 +2619,7 @@ span.qtnGroupHead {
     display: inline-block;
     margin: 0 0 0 10px;
     padding: 0.75em 0.5em 0.25em 17px;
-    background: url(../images/editTinyIcon.png) left center no-repeat;
+    background: url(/admin/images/editTinyIcon.png) left center no-repeat;
 }
 
 .aQuestionSet header input {
@@ -2650,13 +2650,13 @@ span.qtnGroupHead {
     padding: 0.50em 0.5em 0.35em 25px;
     width: 7%;
     border-radius: 3px;
-    background: rgb(235, 235, 235) url(../images/addSet.png) left center no-repeat;
+    background: rgb(235, 235, 235) url(/admin/images/addSet.png) left center no-repeat;
     color: rgb(227, 27, 35);
     @include noWrapTxt;
 }
 
 .aQuestionSet footer a.addSet:hover {
-    background: rgb(214, 214, 214) url(../images/addSet.png) left center no-repeat;
+    background: rgb(214, 214, 214) url(/admin/images/addSet.png) left center no-repeat;
     color: rgb(227, 27, 35);
 }
 
@@ -2774,7 +2774,7 @@ nav.questionActionMenu a:hover {
 }
 
 .aQuestionSet header nav.qtnGroupMenu ul li a.showQuestionGroup {
-    background: url(../images/IconShow.svg) left center no-repeat;
+    background: url(/admin/images/IconShow.svg) left center no-repeat;
     text-align: left;
     padding-left: 25px;
     background-size: 14%;
@@ -2784,7 +2784,7 @@ nav.questionActionMenu a:hover {
 }
 
 .aQuestionSet header nav.qtnGroupMenu ul li a.showQuestionGroup:hover {
-    background: url(../images/IconShowHover.svg) left center no-repeat;
+    background: url(/admin/images/IconShowHover.svg) left center no-repeat;
     text-align: left;
     padding-left: 25px;
     background-size: 14%;
@@ -2792,7 +2792,7 @@ nav.questionActionMenu a:hover {
 
 .aQuestionSet header nav.qtnGroupMenu ul li a.showQuestionGroup.shown {
     color: $flowAnchorLinkHover;
-    background: url(../images/IconShowOrange.svg) left center no-repeat;
+    background: url(/admin/images/IconShowOrange.svg) left center no-repeat;
     padding-left: 25px;
     background-size: 14%;
 }
@@ -2890,43 +2890,43 @@ nav.questionActionMenu a:hover {
 }
 
 // nav.smallMenu ul li a.editQuestion {
-//     background: url(../images/IconEdit.svg) left center no-repeat;
+//     background: url(/admin/images/IconEdit.svg) left center no-repeat;
 // }
 
 // nav.smallMenu ul li a.deleteQuestion {
-//     background: url(../images/IconDelete.svg) left center no-repeat;
+//     background: url(/admin/images/IconDelete.svg) left center no-repeat;
 // }
 
 // nav.smallMenu ul li a.moveQuestion {
-//     background: url(../images/IconMove.svg) left center no-repeat;
+//     background: url(/admin/images/IconMove.svg) left center no-repeat;
 // }
 
 // nav.smallMenu ul li a.copyQuestion {
-//     background: url(../images/IconCopy.svg) left center no-repeat;
+//     background: url(/admin/images/IconCopy.svg) left center no-repeat;
 // }
 
 // nav.smallMenu ul li a.showQuestion {
-//     background: url(../images/IconShow.svg) left center no-repeat;
+//     background: url(/admin/images/IconShow.svg) left center no-repeat;
 // }
 
 // nav.smallMenu ul li a.editQuestion:hover {
-//     background: url(../images/IconEditOrange.svg) left center no-repeat;
+//     background: url(/admin/images/IconEditOrange.svg) left center no-repeat;
 // }
 
 // nav.smallMenu ul li a.deleteQuestion:hover {
-//     background: url(../images/IconDeleteOrange.svg) left center no-repeat;
+//     background: url(/admin/images/IconDeleteOrange.svg) left center no-repeat;
 // }
 
 // nav.smallMenu ul li a.moveQuestion:hover {
-//     background: url(../images/IconMoveOrange.svg) left center no-repeat;
+//     background: url(/admin/images/IconMoveOrange.svg) left center no-repeat;
 // }
 
 // nav.smallMenu ul li a.copyQuestion:hover {
-//     background: url(../images/IconCopyOrange.svg) left center no-repeat;
+//     background: url(/admin/images/IconCopyOrange.svg) left center no-repeat;
 // }
 
 // nav.smallMenu ul li a.showQuestion:hover {
-//     background: url(../images/IconShowOrange.svg) left center no-repeat;
+//     background: url(/admin/images/IconShowOrange.svg) left center no-repeat;
 // }
 
 /*-------------------------------------------------------------------------------------------------------------------------------
@@ -3703,7 +3703,7 @@ div.drawHandle {
 .placeMarkBasicInfo {
     padding: 1em 2%;
     width: 96%;
-    background: url(../images/mapPointDetailSep.png) center bottom no-repeat;
+    background: url(/admin/images/mapPointDetailSep.png) center bottom no-repeat;
 }
 
 .placeMarkBasicInfo li {
@@ -3830,7 +3830,7 @@ footer.bottomPage nav ul li a {
 footer.bottomPage nav ul li a.akvoDotOrg {
     margin: 0 10px 0 0;
     width: 42px;
-    background: url(../images/akvo.orgLogo.svg) center center no-repeat;
+    background: url(/admin/images/akvo.orgLogo.svg) center center no-repeat;
     text-indent: -9999px;
 }
 
@@ -4254,7 +4254,7 @@ table#languageOption td.formTitle {
 table.surveyTranslate {
     -o-border-radius: 0.25em;
     border-radius: 0.25em;
-    background: white url(../images/borderMiddle.png) center top repeat-y;
+    background: white url(/admin/images/borderMiddle.png) center top repeat-y;
 }
 
 table.surveyTranslate td {
@@ -4689,7 +4689,7 @@ table.surveyDetails {
             }
             .tabNav {
                 .aFormTab {
-                    background: rgb(32, 32, 36) url(../images/IconForms.png) no-repeat left center;
+                    background: rgb(32, 32, 36) url(/admin/images/IconForms.png) no-repeat left center;
                 }
             }
         }
@@ -4892,10 +4892,10 @@ table.surveyDetails {
             width: 20px;
             text-indent: -9999px;
             &.editSurvey {
-                background: url(../images/IconEdit.svg) center center no-repeat;
+                background: url(/admin/images/IconEdit.svg) center center no-repeat;
                 background-size: 18px 18px;
                 &:hover {
-                    background: url(../images/IconEditOrange.svg) center center no-repeat;
+                    background: url(/admin/images/IconEditOrange.svg) center center no-repeat;
                     background-size: 18px 18px;
                 }
             }
@@ -5073,19 +5073,19 @@ nav.cascadeBreadCrumb {
                 color: white;
                 padding: 0 2%;
                 width: 96%;
-                background: url(../images/carret.svg) right center no-repeat;
+                background: url(/admin/images/carret.svg) right center no-repeat;
                 margin: 5px auto;
                 background-size: 15px 15px;
                 border-top: 1px solid rgba(32, 32, 36, 0.1);
                 &:first-of-type {}
                 &:hover {
-                    background: rgba(255, 255, 255, 0.2) url(../images/carret.svg) right center no-repeat;
+                    background: rgba(255, 255, 255, 0.2) url(/admin/images/carret.svg) right center no-repeat;
                     background-size: 15px 15px;
                     cursor: pointer;
                     box-shadow: 1px 1px 1px rgba(32, 32, 36, 0.2);
                 }
                 &.selected {
-                    background: rgba(41, 119, 152, 0.1) url(../images/carret.svg) right center no-repeat;
+                    background: rgba(41, 119, 152, 0.1) url(/admin/images/carret.svg) right center no-repeat;
                     background-size: 15px 15px;
                     cursor: text;
                     box-shadow: 1px 1px 1px rgba(32, 32, 36, 0.2);
@@ -5146,13 +5146,13 @@ a.levelUp {
     display: table;
     margin: 20px auto 0;
     padding: 15px 35px 15px 15px;
-    background: rgba($flowAnchorLink, 0) url(../images/IconRightBlue.svg) right center no-repeat;
+    background: rgba($flowAnchorLink, 0) url(/admin/images/IconRightBlue.svg) right center no-repeat;
     -webkit-transition: color 0.2s ease-in, background-color 0.2s ease-in;
     transition: color 0.2s ease-in, background-color 0.2s ease-in;
     -webkit-background-size: 25px 25px;
     background-size: 25px 25px;
     &:hover {
-        background: rgba($flowAnchorLink, 0.1) url(../images/IconRightOrange.svg) right center no-repeat;
+        background: rgba($flowAnchorLink, 0.1) url(/admin/images/IconRightOrange.svg) right center no-repeat;
         -webkit-background-size: 25px 25px;
         background-size: 25px 25px;
     }
@@ -5162,13 +5162,13 @@ a.levelDown {
     display: table;
     margin: 20px auto 0;
     padding: 15px 15px 15px 35px;
-    background: rgba($flowAnchorLink, 0) url(../images/IconLeftBlue.svg) left center no-repeat;
+    background: rgba($flowAnchorLink, 0) url(/admin/images/IconLeftBlue.svg) left center no-repeat;
     -webkit-transition: color 0.2s ease-in, background-color 0.2s ease-in;
     transition: color 0.2s ease-in, background-color 0.2s ease-in;
     -webkit-background-size: 25px 25px;
     background-size: 25px 25px;
     &:hover {
-        background: rgba($flowAnchorLink, 0.1) url(../images/IconLeftOrange.svg) left center no-repeat;
+        background: rgba($flowAnchorLink, 0.1) url(/admin/images/IconLeftOrange.svg) left center no-repeat;
         -webkit-background-size: 25px 25px;
         background-size: 25px 25px;
     }
@@ -5181,13 +5181,13 @@ li.disable {
         @include opacity(0.2);
         color: white;
         padding: 15px 35px 15px 15px;
-        background: rgba($flowAnchorLink, 0) url(../images/IconRightWhite.svg) right center no-repeat;
+        background: rgba($flowAnchorLink, 0) url(/admin/images/IconRightWhite.svg) right center no-repeat;
         -webkit-background-size: 25px 25px;
         background-size: 25px 25px;
         &:hover {
             -webkit-background-size: 25px 25px;
             background-size: 25px 25px;
-            background: rgba($flowAnchorLink, 0) url(../images/IconRightWhite.svg) right center no-repeat;
+            background: rgba($flowAnchorLink, 0) url(/admin/images/IconRightWhite.svg) right center no-repeat;
         }
     }
     a.levelDown {
@@ -5196,11 +5196,11 @@ li.disable {
         @include opacity(0.2);
         color: white;
         padding: 15px 15px 15px 35px;
-        background: rgba($flowAnchorLink, 0) url(../images/IconLeftWhite.svg) left center no-repeat;
+        background: rgba($flowAnchorLink, 0) url(/admin/images/IconLeftWhite.svg) left center no-repeat;
         -webkit-background-size: 25px 25px;
         background-size: 25px 25px;
         &:hover {
-            background: rgba($flowAnchorLink, 0) url(../images/IconLeftWhite.svg) left center no-repeat;
+            background: rgba($flowAnchorLink, 0) url(/admin/images/IconLeftWhite.svg) left center no-repeat;
             -webkit-background-size: 25px 25px;
             background-size: 25px 25px;
         }
@@ -5282,7 +5282,7 @@ li.disable {
     border-radius: 3px;
     box-shadow: 0 5px 8px rgba(212, 212, 212, 0.5);
     padding: 5px 3px 5px 25px;
-    background: rgb(248, 248, 248) url(../images/loader.gif) 5px center no-repeat;
+    background: rgb(248, 248, 248) url(/admin/images/loader.gif) 5px center no-repeat;
     color: rgb(252, 159, 0);
     font-weight: bold;
 }
@@ -5481,9 +5481,9 @@ html.navMaps, .public {
             padding: 5px 0 10px 25px;
             -webkit-background-size: 15px auto;
             background-size: 15px auto;
-            background: url(../images/topnavUsers.svg) left center no-repeat;
+            background: url(/admin/images/topnavUsers.svg) left center no-repeat;
             &:hover {
-                background: url(../images/topnavUsersOrange.svg) left center no-repeat;
+                background: url(/admin/images/topnavUsersOrange.svg) left center no-repeat;
             }
         }
     }
@@ -5587,13 +5587,13 @@ svg {
                 &.homeRoot {
                     border-radius: 3px 0 0 3px;
                     width: 40px;
-                    background: url(../images/breadCrumb-Root.png) center center no-repeat $akvoBlack;
+                    background: url(/admin/images/breadCrumb-Root.png) center center no-repeat $akvoBlack;
                     background-size: 40%;
                     text-indent: -9999px;
                     z-index: 9999;
                     margin-left: 0;
                     &:hover {
-                        background: url(../images/breadCrumb-Root.png) center center no-repeat $akvoBlack;
+                        background: url(/admin/images/breadCrumb-Root.png) center center no-repeat $akvoBlack;
                         background-size: 40%;
                     }
                 }
@@ -5632,31 +5632,31 @@ svg {
         }
         &.dataCleanExp {
             h2 {
-                background: url(../images/Export01.svg) center top no-repeat;
+                background: url(/admin/images/Export01.svg) center top no-repeat;
                 background-size: 60px;
             }
         }
         &.dataAnalyseExp {
             h2 {
-                background: url(../images/Export02.svg) center top no-repeat;
+                background: url(/admin/images/Export02.svg) center top no-repeat;
                 background-size: 60px;
             }
         }
         &.compReportExp {
             h2 {
-                background: url(../images/Export03.svg) center top no-repeat;
+                background: url(/admin/images/Export03.svg) center top no-repeat;
                 background-size: 60px;
             }
         }
         &.geoShapeDataExp {
             h2 {
-                background: url(../images/Export04.svg) center top no-repeat;
+                background: url(/admin/images/Export04.svg) center top no-repeat;
                 background-size: 60px;
             }
         }
         &.surveyFormExp {
             h2 {
-                background: url(../images/Export05.svg) center top no-repeat;
+                background: url(/admin/images/Export05.svg) center top no-repeat;
                 background-size: 60px;
             }
         }
@@ -5851,7 +5851,7 @@ svg {
             text-align: center;
             .zipIcn {
                 height: 80px;
-                background: url(../images/zipIcn.svg) center top no-repeat;
+                background: url(/admin/images/zipIcn.svg) center top no-repeat;
                 background-size: 60px;
             }
             p {
@@ -6267,7 +6267,7 @@ svg {
                         display: inline-block;
                         width: 100%;
                         height: 23px;
-                        background: url(../images/loading.svg) left center no-repeat;
+                        background: url(/admin/images/loading.svg) left center no-repeat;
                         background-size: contain;
                         font-size: 0.8em;
                     }
@@ -6300,45 +6300,52 @@ svg {
                 }
             }
             &.dataCleanExp {
-                background: url(../images/Export01.svg) 15px center no-repeat;
+                background: url(/admin/images/Export01.svg) 15px center no-repeat;
                 background-size: 30px;
                 &.exportGenerating {
-                    background: rgba(128, 128, 128, 0.1) url(../images/Export01.svg) 15px center no-repeat;
+                    background: rgba(128, 128, 128, 0.1) url(/admin/images/Export01.svg) 15px center no-repeat;
                     background-size: 30px;
                 }
             }
             &.dataAnalyseExp {
-                background: url(../images/Export02.svg) 15px center no-repeat;
+                background: url(/admin/images/Export02.svg) 15px center no-repeat;
                 background-size: 30px;
                 &.exportGenerating {
-                    background: rgba(128, 128, 128, 0.1) url(../images/Export02.svg) 15px center no-repeat;
+                    background: rgba(128, 128, 128, 0.1) url(/admin/images/Export02.svg) 15px center no-repeat;
                     background-size: 30px;
                 }
             }
             &.compReportExp {
-                background: url(../images/Export03.svg) 15px center no-repeat;
+                background: url(/admin/images/Export03.svg) 15px center no-repeat;
                 background-size: 30px;
                 &.exportGenerating {
-                    background: rgba(128, 128, 128, 0.1) url(../images/Export03.svg) 15px center no-repeat;
+                    background: rgba(128, 128, 128, 0.1) url(/admin/images/Export03.svg) 15px center no-repeat;
                     background-size: 30px;
                 }
             }
             &.geoShapeDataExp {
-                background: url(../images/Export04.svg) 15px center no-repeat;
+                background: url(/admin/images/Export04.svg) 15px center no-repeat;
                 background-size: 30px;
                 &.exportGenerating {
-                    background: rgba(128, 128, 128, 0.1) url(../images/Export04.svg) 15px center no-repeat;
+                    background: rgba(128, 128, 128, 0.1) url(/admin/images/Export04.svg) 15px center no-repeat;
                     background-size: 30px;
                 }
             }
             &.surveyFormExp {
-                background: url(../images/Export05.svg) 15px center no-repeat;
+                background: url(/admin/images/Export05.svg) 15px center no-repeat;
                 background-size: 30px;
                 &.exportGenerating {
-                    background: rgba(128, 128, 128, 0.1) url(../images/Export05.svg) 15px center no-repeat;
+                    background: rgba(128, 128, 128, 0.1) url(/admin/images/Export05.svg) 15px center no-repeat;
                     background-size: 30px;
                 }
             }
         }
     }
-}
\ No newline at end of file
+}
+
+.not-active {
+  pointer-events: none;
+  cursor: default;
+  text-decoration: none;
+  color: black;
+}
diff --git a/Dashboard/app/css/screen.css b/Dashboard/app/css/screen.css
deleted file mode 100644
index ba87fcaf05..0000000000
--- a/Dashboard/app/css/screen.css
+++ /dev/null
@@ -1,3 +0,0 @@
-@import url("main.css");
-
-@import url("custom-theme/jquery-ui-1.8.21.custom.css");
\ No newline at end of file
diff --git a/Dashboard/app/css/screen.scss b/Dashboard/app/css/screen.scss
new file mode 100644
index 0000000000..768d26ece0
--- /dev/null
+++ b/Dashboard/app/css/screen.scss
@@ -0,0 +1,3 @@
+@import "main.scss";
+
+@import "custom-theme/jquery-ui-1.8.21.custom.css";
\ No newline at end of file
diff --git a/Dashboard/app/dashboard.html b/Dashboard/app/dashboard.ejs
similarity index 65%
rename from Dashboard/app/dashboard.html
rename to Dashboard/app/dashboard.ejs
index 026d691d44..8ba68a250c 100644
--- a/Dashboard/app/dashboard.html
+++ b/Dashboard/app/dashboard.ejs
@@ -13,15 +13,14 @@
             <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
             <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
         <![endif]-->
-    <!-- Stylesheets -->
-    <link rel="stylesheet" href="css/screen.css" media="screen,projection" />
-</head>
-
-<body class="appPage">
+    
+    <script type="text/javascript">
+        window.FLOW = window.FLOW || {};
+    </script>
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.8.2/jquery.min.js" integrity="sha384-TlirNbKpD2RIgh6I9thXvaNiNhPn2e4sI0Adwq4SwWXvDMdol60LTz9m/24VynHW" crossorigin="anonymous"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/1.0.rc.1/handlebars.min.js" integrity="sha384-1cdj3p3bIpU9pC5rwhdr9KuOyIAzATeDl8CzvgeeEAX2+04CDEMTCKHzURcqkLU6" crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/ember.js/1.0.0-pre.2/ember-1.0.0-pre.2.min.js" integrity="sha384-8D2qnfMv14eNLoq1IIP/00cY2ZXj16DPhGJdnwNMHSwXM7HqMGljfDUavTzDJ5dY" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/ember.js/1.0.0-pre.2/ember-1.0.0-pre.2.min.js"  crossorigin="anonymous"></script>
     <script src="/vendorjs/js/vendor/ember-data-rev10.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.8.21/jquery-ui.min.js" integrity="sha384-TRmDLt6CvOQBqWp02sWDp/VVYxlkm9lvqzMt7OwAoSHqmGtELVfE/pfkH3zcea8j" crossorigin="anonymous"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/datatables/1.9.2/jquery.dataTables.min.js" integrity="sha384-l4ztyMkjOikIXT8yH7aYF35ElUqxfPgSf9d+fUgST1ZgUFJ8/PD4ZNc8tk49GQxx" crossorigin="anonymous"></script>
@@ -29,14 +28,10 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/resumable.js/1.0.3/resumable.min.js" integrity="sha384-iybtPyEliVnE9VSRDxi4RtPJDCth3R0Gj90w5Puf1cT/R8GYnPiXu10MMWITqiit" crossorigin="anonymous"></script>
     <script src="/vendorjs/js/vendor/Math.uuid.js"></script>
 
+    
     <script src="js/loader.js"></script>
-    <script src="js/geocells.js"></script>
     <script src="/flowenv.js"></script>
     <script src="/currentuser.js"></script>
-    <script src="js/app.js"></script>
-    <script>
-        loader.require('akvo-flow/main');
-    </script>
 
     <script>
       //default leaflet library
@@ -44,41 +39,14 @@
       var cssSrc = "https://api.mapbox.com/mapbox.js/v3.1.1/mapbox.css";
       var jsIntegrity = 'integrity="sha384-DmQhW9kLmOXK0xubm8w+Bd34nJq7Plt9clKmd2XxjgUNuoHcWdxV3GCeO7YSFc74" crossorigin="anonymous"';
       var cssIntegrity = 'integrity="sha384-codniTXEGsozlodYdGbtcNHSm0452RDVJyCJ3eEw+jagZXmaz9RIFHaBD+g/wrvS" crossorigin="anonymous"';
-      if (FLOW.Env.mapsProvider == 'google') {
-        var regionBias = FLOW.Env.googleMapsRegionBias;
-        var region = regionBias ? '&region=' + regionBias : '';
-        document.write('<script src="https://maps.google.com/maps/api/js?key=AIzaSyBZU7kLJ75VlTlC5Qrfi1n1N-5hJYProuQ' + region + '"><\/script>');
-      }
       document.write("<link rel=\"stylesheet\" href=\""+cssSrc+"\"/>");
       document.write("<script type=\"text/javascript\" src=\""+jsSrc+"\"><\/script>");
     </script>
-    <script src="/vendorjs/js/vendor/Google.js"></script>
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/iframe-resizer/2.6.3/iframeResizer.min.js" integrity="sha384-igiKnCW1DXdmgq8oZzcdRos1LdPeHVAjU2xu1GOJ9aTxgmsB5NRTrOWQqn26MERR" crossorigin="anonymous"></script>
-    <script src="js/flowDashboard.js"></script>
-
-    <script type="text/javascript">
-        var _paq = _paq || [];
-        _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-        _paq.push(["setCookieDomain", "*.akvoflow.org"]);
-        _paq.push(["setDomains", ["*.akvoflow.org"]]);
-        _paq.push(["trackPageView"]);
-        _paq.push(["enableLinkTracking"]);
+</head>
 
-        (function() {
-            var u = (("https:" == document.location.protocol) ? "https" : "http") + "://analytics.akvo.org/";
-            _paq.push(["setTrackerUrl", u + "piwik.php"]);
-            _paq.push(["setSiteId", "10"]);
-            var d = document,
-                g = d.createElement("script"),
-                s = d.getElementsByTagName("script")[0];
-            g.type = "text/javascript";
-            g.defer = true;
-            g.async = true;
-            g.src = u + "piwik.js";
-            s.parentNode.insertBefore(g, s);
-        })();
-    </script>
+<body class="appPage">
 </body>
 
 </html>
diff --git a/Dashboard/app/js/lib/analytics.js b/Dashboard/app/js/lib/analytics.js
new file mode 100644
index 0000000000..49a16ce53c
--- /dev/null
+++ b/Dashboard/app/js/lib/analytics.js
@@ -0,0 +1,20 @@
+var _paq = _paq || [];
+_paq.push(['setDocumentTitle', `${document.domain}/${document.title}`]);
+_paq.push(['setCookieDomain', '*.akvoflow.org']);
+_paq.push(['setDomains', ['*.akvoflow.org']]);
+_paq.push(['trackPageView']);
+_paq.push(['enableLinkTracking']);
+
+(function () {
+  const u = `${(document.location.protocol == 'https:') ? 'https' : 'http'}://analytics.akvo.org/`;
+  _paq.push(['setTrackerUrl', `${u}piwik.php`]);
+  _paq.push(['setSiteId', '10']);
+  const d = document;
+  const g = d.createElement('script');
+  const s = d.getElementsByTagName('script')[0];
+  g.type = 'text/javascript';
+  g.defer = true;
+  g.async = true;
+  g.src = `${u}piwik.js`;
+  s.parentNode.insertBefore(g, s);
+}());
diff --git a/Dashboard/app/js/lib/controllers/controllers-public.js b/Dashboard/app/js/lib/controllers/controllers-public.js
index 0004a33f80..977b5601cf 100644
--- a/Dashboard/app/js/lib/controllers/controllers-public.js
+++ b/Dashboard/app/js/lib/controllers/controllers-public.js
@@ -3,8 +3,8 @@
 // ***********************************************//
 // Define the main application controller. This is automatically picked up by
 // the application and initialized.
+loader.require('akvo-flow/flowenv');
 require('akvo-flow/core-common');
-require('akvo-flow/flowenv');
 require('akvo-flow/controllers/general-controllers-common');
 require('akvo-flow/controllers/maps-controllers-common');
 
diff --git a/Dashboard/app/js/lib/controllers/controllers.js b/Dashboard/app/js/lib/controllers/controllers.js
index 66fe8e7164..96bb6632b4 100644
--- a/Dashboard/app/js/lib/controllers/controllers.js
+++ b/Dashboard/app/js/lib/controllers/controllers.js
@@ -3,10 +3,10 @@
 // ***********************************************//
 // Define the main application controller. This is automatically picked up by
 // the application and initialized.
+loader.require('akvo-flow/flowenv');
+loader.require('akvo-flow/currentuser');
 require('akvo-flow/core-common');
-require('akvo-flow/flowenv');
 require('akvo-flow/controllers/languages');
-require('akvo-flow/currentuser');
 require('akvo-flow/controllers/permissions');
 require('akvo-flow/controllers/general-controllers-common');
 require('akvo-flow/controllers/survey-controllers');
@@ -21,21 +21,19 @@ require('akvo-flow/controllers/survey-selection');
 FLOW.ApplicationController = Ember.Controller.extend({});
 
 FLOW.role = Ember.Object.create({
-	SUPER_ADMIN: function () {
+	SUPER_ADMIN: Ember.computed(function () {
 		return FLOW.currentUser && FLOW.currentUser.permissionList === 0;
-	}.property(),
+	}).property(),
 
-	ADMIN: function () {
+	ADMIN: Ember.computed(function () {
 		return FLOW.currentUser && FLOW.currentUser.permissionList <= 10;
-	}.property(),
+	}).property(),
 
-	USER: function () {
+	USER: Ember.computed(function () {
 		return FLOW.currentUser && FLOW.currentUser.permissionList <= 20;
-	}.property()
+	}).property()
 });
 
-//require('akvo-flow/currentuser');
-
 // Navigation controllers
 FLOW.NavigationController = Em.Controller.extend({
   selected: null
diff --git a/Dashboard/app/js/lib/controllers/data-controllers.js b/Dashboard/app/js/lib/controllers/data-controllers.js
index f128df9bfb..da7870fa50 100644
--- a/Dashboard/app/js/lib/controllers/data-controllers.js
+++ b/Dashboard/app/js/lib/controllers/data-controllers.js
@@ -1,10 +1,13 @@
+import observe from '../mixins/observe';
 
 function capitaliseFirstLetter(string) {
   if (Ember.empty(string)) return "";
   return string.charAt(0).toUpperCase() + string.slice(1);
 }
 
-FLOW.cascadeResourceControl = Ember.ArrayController.create({
+FLOW.cascadeResourceControl = Ember.ArrayController.create(observe({
+  'FLOW.selectedControl.selectedCascadeResource': 'hasQuestions',
+}), {
   content:null,
   published:null,
   statusUpdateTrigger:false,
@@ -74,13 +77,13 @@ FLOW.cascadeResourceControl = Ember.ArrayController.create({
       return;
     }
     FLOW.store.findQuery(FLOW.Question, {cascadeResourceId: FLOW.selectedControl.selectedCascadeResource.get('keyId')});
-  }.observes('FLOW.selectedControl.selectedCascadeResource'),
+  },
 
   triggerStatusUpdate: function(){
     this.toggleProperty('statusUpdateTrigger');
   },
 
-  currentStatus: function () {
+  currentStatus: Ember.computed(function () {
     // hack to get translation keys, don't delete them
     // {{t _not_published}}
     // {{t _publishing}}
@@ -91,14 +94,14 @@ FLOW.cascadeResourceControl = Ember.ArrayController.create({
     }
     status = ('_' + FLOW.selectedControl.selectedCascadeResource.get('status')).toLowerCase();
     return Ember.String.loc(status);
-  }.property('FLOW.selectedControl.selectedCascadeResource','this.statusUpdateTrigger'),
+  }).property('FLOW.selectedControl.selectedCascadeResource','this.statusUpdateTrigger'),
 
-  isPublished: function () {
+  isPublished: Ember.computed(function () {
     if (!FLOW.selectedControl.selectedCascadeResource) {
       return false;
     }
     return FLOW.selectedControl.selectedCascadeResource.get('status') === 'PUBLISHED';
-  }.property('FLOW.selectedControl.selectedCascadeResource','this.statusUpdateTrigger')
+  }).property('FLOW.selectedControl.selectedCascadeResource','this.statusUpdateTrigger')
 });
 
 FLOW.cascadeNodeControl = Ember.ArrayController.create({
@@ -167,7 +170,10 @@ FLOW.cascadeNodeControl = Ember.ArrayController.create({
 });
 
 
-FLOW.surveyInstanceControl = Ember.ArrayController.create({
+FLOW.surveyInstanceControl = Ember.ArrayController.create(observe({
+  content: 'contentChanged',
+  'content.isLoaded': 'contentChanged',
+}), {
   sortProperties: ['collectionDate'],
   sortAscending: false,
   selectedSurvey: null,
@@ -202,7 +208,7 @@ FLOW.surveyInstanceControl = Ember.ArrayController.create({
     });
 
     this.set('currentContents', mutableContents);
-  }.observes('content', 'content.isLoaded'),
+  },
 
   removeInstance: function(instance) {
     this.get('currentContents').forEach(function(item, i, currentContents) {
@@ -212,18 +218,18 @@ FLOW.surveyInstanceControl = Ember.ArrayController.create({
     });
   },
 
-  allAreSelected: function (key, value) {
+  allAreSelected: Ember.computed(function (key, value) {
     if (arguments.length === 2) {
       this.setEach('isSelected', value);
       return value;
     } else {
       return !this.get('isEmpty') && this.everyProperty('isSelected', true);
     }
-  }.property('@each.isSelected'),
+  }).property('@each.isSelected'),
 
-  atLeastOneSelected: function () {
+  atLeastOneSelected: Ember.computed(function () {
     return this.filterProperty('isSelected', true).get('length');
-  }.property('@each.isSelected'),
+  }).property('@each.isSelected'),
 
   // fired from tableColumnView.sort
   getSortInfo: function () {
@@ -232,7 +238,10 @@ FLOW.surveyInstanceControl = Ember.ArrayController.create({
   }
 });
 
-FLOW.SurveyedLocaleController = Ember.ArrayController.extend({
+FLOW.SurveyedLocaleController = Ember.ArrayController.extend(observe({
+  content: 'contentChanged',
+  'content.isLoaded': 'contentChanged',
+}), {
   sortProperties: ['collectionDate'],
   sortAscending: false,
   selectedSurvey: null,
@@ -251,7 +260,7 @@ FLOW.SurveyedLocaleController = Ember.ArrayController.extend({
     });
 
     this.set('currentContents', mutableContents);
-  }.observes('content', 'content.isLoaded'),
+  },
 
   removeLocale: function(locale) {
     this.get('currentContents').forEach(function(item, i, currentContents) {
@@ -263,7 +272,7 @@ FLOW.SurveyedLocaleController = Ember.ArrayController.extend({
 
   /* the current user is able to delete surveyed locales
     stored in the 'content' property of this controller */
-  userCanDelete: function() {
+  userCanDelete: Ember.computed(function() {
     if(this.get('content') === null) {
       return false;
     }
@@ -272,7 +281,7 @@ FLOW.SurveyedLocaleController = Ember.ArrayController.extend({
       return FLOW.surveyGroupControl.userCanDeleteData(surveyedLocale.get('surveyGroupId'));
     }
     return false; // prevents deletion incase no surveyId found
-  }.property('content'),
+  }).property('content'),
 });
 
 FLOW.questionAnswerControl = Ember.ArrayController.create({
@@ -367,7 +376,10 @@ FLOW.questionAnswerControl = Ember.ArrayController.create({
   },
 });
 
-FLOW.locationControl = Ember.ArrayController.create({
+FLOW.locationControl = Ember.ArrayController.create(observe({
+  'this.selectedCountry': 'populateLevel1',
+  'this.selectedLevel1': 'populateLevel2',
+}), {
   selectedCountry: null,
   content:null,
   level1Content:null,
@@ -383,7 +395,7 @@ FLOW.locationControl = Ember.ArrayController.create({
       parentId:null
       }));
     }
-  }.observes('this.selectedCountry'),
+  },
 
   populateLevel2: function(){
     if (!Ember.none(this.get('selectedLevel1')) && this.selectedLevel1.get('name').length > 0){
@@ -393,7 +405,7 @@ FLOW.locationControl = Ember.ArrayController.create({
       parentId:this.selectedLevel1.get('keyId')
       }));
     }
-  }.observes('this.selectedLevel1')
+  },
 
 });
 
@@ -451,7 +463,7 @@ FLOW.ApprovalGroupController = Ember.ObjectController.extend({
      * to a string representation in order to bind successfully to
      * value attribute of the generated <option> entities
      */
-    isOrderedApprovalGroup: function (key, value, previousValue) {
+    isOrderedApprovalGroup: Ember.computed(function (key, value, previousValue) {
         var group = this.content;
 
         // setter
@@ -465,7 +477,7 @@ FLOW.ApprovalGroupController = Ember.ObjectController.extend({
         } else {
             return "unordered"
         }
-    }.property('this.content'),
+    }).property('this.content'),
 
 
 
diff --git a/Dashboard/app/js/lib/controllers/device-controllers.js b/Dashboard/app/js/lib/controllers/device-controllers.js
index aa94a455ac..922bad89cc 100644
--- a/Dashboard/app/js/lib/controllers/device-controllers.js
+++ b/Dashboard/app/js/lib/controllers/device-controllers.js
@@ -1,3 +1,5 @@
+import observe from '../mixins/observe';
+
 FLOW.deviceGroupControl = Ember.ArrayController.create({
   content: null,
   contentNoUnassigned: null,
@@ -41,18 +43,18 @@ FLOW.deviceControl = Ember.ArrayController.create({
     this.set('sortAscending', false);
   },
 
-  allAreSelected: function (key, value) {
+  allAreSelected: Ember.computed(function (key, value) {
     if (arguments.length === 2) {
       this.setEach('isSelected', value);
       return value;
     } else {
       return !this.get('isEmpty') && this.everyProperty('isSelected', true);
     }
-  }.property('@each.isSelected'),
+  }).property('@each.isSelected'),
 
-  atLeastOneSelected: function () {
+  atLeastOneSelected: Ember.computed(function () {
     return this.filterProperty('isSelected', true).get('length');
-  }.property('@each.isSelected'),
+  }).property('@each.isSelected'),
 
   // fired from tableColumnView.sort
   getSortInfo: function () {
@@ -62,7 +64,9 @@ FLOW.deviceControl = Ember.ArrayController.create({
 });
 
 
-FLOW.devicesInGroupControl = Ember.ArrayController.create({
+FLOW.devicesInGroupControl = Ember.ArrayController.create(observe({
+  'FLOW.selectedControl.selectedDeviceGroup': 'setDevicesInGroup',
+}), {
   content: null,
   sortProperties: ['combinedName'],
   sortAscending: true,
@@ -82,7 +86,7 @@ FLOW.devicesInGroupControl = Ember.ArrayController.create({
         }));
       }
     }
-  }.observes('FLOW.selectedControl.selectedDeviceGroup')
+  },
 });
 
 
diff --git a/Dashboard/app/js/lib/controllers/general-controllers-common.js b/Dashboard/app/js/lib/controllers/general-controllers-common.js
index dd257bbf71..bcea7be4ad 100644
--- a/Dashboard/app/js/lib/controllers/general-controllers-common.js
+++ b/Dashboard/app/js/lib/controllers/general-controllers-common.js
@@ -1,4 +1,6 @@
-FLOW.dashboardLanguageControl = Ember.Object.create({
+import observe from '../mixins/observe';
+
+FLOW.dashboardLanguageControl = Ember.Object.create(observe({ dashboardLanguage: 'languageChanged' }), {
   dashboardLanguage: FLOW.Env.locale,
 
   content: [{ label: "English (Default)", value: "en"},
@@ -8,19 +10,22 @@ FLOW.dashboardLanguageControl = Ember.Object.create({
             { label: "Português", value: "pt" },
             { label: "Tiếng Việt", value: "vi"}],
 
-  languageChanged: function () {
-    var localeUrl = '/ui-strings.js?locale=' + this.dashboardLanguage;
-    $.ajax({
-      url: localeUrl,
-      complete: function () {
-        location.reload(false);
-      },
-    });
-  }.observes('dashboardLanguage'),
+  languageChanged: function(){ 
+     var localeUrl = '/ui-strings.js?locale=' + this.dashboardLanguage;
+     $.ajax({
+       url: localeUrl,
+       complete: function () {
+         location.reload(false);
+       },
+     });
+     
+  },
 });
- 
- 
-FLOW.selectedControl = Ember.Controller.create({
+
+FLOW.selectedControl = Ember.Controller.create(observe({
+  'this.selectedSurveyGroup': 'deselectSurveyGroupChildren',
+  'this.selectedSurvey': 'deselectSurveyChildren',
+}), {
   selectedSurveyGroup: null,
   selectedSurvey: null,
   selectedSurveys: [],
@@ -46,22 +51,18 @@ FLOW.selectedControl = Ember.Controller.create({
   cascadeImportNumLevels: null,
   cascadeImportIncludeCodes: null,
 
-  // OptionQuestions:function (){
-  //   console.log('optionquestions 1');
-  // }.observes('this.selectedSurveyOPTIONQuestions'),
-
   // when selected survey changes, deselect selected surveys and question groups
   deselectSurveyGroupChildren: function () {
     FLOW.selectedControl.set('selectedSurvey', null);
     FLOW.selectedControl.set('selectedSurveyAllQuestions', null);
     FLOW.selectedControl.set('selectedQuestionGroup', null);
     FLOW.selectedControl.set('selectedQuestion', null);
-  }.observes('this.selectedSurveyGroup'),
+  },
 
   deselectSurveyChildren: function () {
     FLOW.selectedControl.set('selectedQuestionGroup', null);
     FLOW.selectedControl.set('selectedQuestion', null);
-  }.observes('this.selectedSurvey')
+  },
 });
 
 
diff --git a/Dashboard/app/js/lib/controllers/maps-controllers-common.js b/Dashboard/app/js/lib/controllers/maps-controllers-common.js
index ab87bf38ee..a091f0bc6b 100644
--- a/Dashboard/app/js/lib/controllers/maps-controllers-common.js
+++ b/Dashboard/app/js/lib/controllers/maps-controllers-common.js
@@ -1,3 +1,5 @@
+import observe from '../mixins/observe';
+
 /**
   Controllers related to the map tab
   Definition:
@@ -6,7 +8,9 @@
       a placemark counterpart.
 **/
 
-FLOW.MapsController = Ember.ArrayController.extend({
+FLOW.MapsController = Ember.ArrayController.extend(observe({
+    'this.content.isLoaded': 'populateMap',
+}), {
     content: null,
     map: null,
     geocellCache: [],
@@ -32,11 +36,11 @@ FLOW.MapsController = Ember.ArrayController.extend({
             }
 
             placemarks.forEach(function (placemark) {
-                marker = this.addMarker(placemark);
+                var marker = this.addMarker(placemark);
                 this.allPlacemarks.addLayer(marker);
             }, this);
         }
-    }.observes('this.content.isLoaded'),
+    },
 
     adaptMap: function(bestBB, zoomlevel){
         var bbString = "", gcLevel = 0, listToRetrieve = [], surveyId;
@@ -70,7 +74,7 @@ FLOW.MapsController = Ember.ArrayController.extend({
     },
 
     addMarker: function (placemark) {
-        var marker;
+        var marker, count;
         if (placemark.get('level') > 0){
             count = placemark.get('count');
             if (count == 1) {
@@ -86,7 +90,7 @@ FLOW.MapsController = Ember.ArrayController.extend({
                 return marker;
             }
 
-            myIcon = L.divIcon({
+            var myIcon = L.divIcon({
                 html: '<div><span>' + count + '</span></div>',
                 className: 'marker-cluster',
                 iconSize: new L.Point(40, 40)});
@@ -146,7 +150,10 @@ FLOW.MapsController = Ember.ArrayController.extend({
     }
 });
 
-FLOW.placemarkDetailController = Ember.ArrayController.create({
+FLOW.placemarkDetailController = Ember.ArrayController.create(observe({
+    'FLOW.router.mapsController.selectedMarker': 'mapPointClickHandler',
+    'FLOW.surveyInstanceControl.content.isLoaded': 'mapPointRetrieveDetailsHandler',
+}), {
   content: Ember.A(),
 
   dataPoint: null,
@@ -154,13 +161,13 @@ FLOW.placemarkDetailController = Ember.ArrayController.create({
   dataPointCollectionDate: null,
   noSubmissions: false,
 
-  dataPointDisplayName: function () {
+  dataPointDisplayName: Ember.computed(function () {
       return this.dataPoint && this.dataPoint.get('displayName')
-  }.property('this.dataPoint.isLoaded'),
+  }).property('this.dataPoint.isLoaded'),
 
-  dataPointIdentifier: function () {
+  dataPointIdentifier: Ember.computed(function () {
       return this.dataPoint && this.dataPoint.get('identifier')
-  }.property('this.dataPoint.isLoaded'),
+  }).property('this.dataPoint.isLoaded'),
 
   /*
   * Observer that loads a datapoint and its associated details when clicked
@@ -174,7 +181,7 @@ FLOW.placemarkDetailController = Ember.ArrayController.create({
                 'surveyedLocaleId': selectedPlacemarkId,
           }));
       }
-  }.observes('FLOW.router.mapsController.selectedMarker'),
+  },
 
   /*
   * Observer that retrieves question answers associated with a datapoint
@@ -206,5 +213,5 @@ FLOW.placemarkDetailController = Ember.ArrayController.create({
         this.set('noSubmissions', true);
         this.set('dataPointCollectionDate', null);
       }
-  }.observes('FLOW.surveyInstanceControl.content.isLoaded'),
+  },
 });
diff --git a/Dashboard/app/js/lib/controllers/permissions.js b/Dashboard/app/js/lib/controllers/permissions.js
index dfc4ff238b..2d3dea3466 100644
--- a/Dashboard/app/js/lib/controllers/permissions.js
+++ b/Dashboard/app/js/lib/controllers/permissions.js
@@ -1,143 +1,4 @@
 FLOW.permControl = Ember.Controller.create({
-  perms: [],
-
-  init: function () {
-    this._super();
-    this.initPermissions();
-    this.setUserPermissions();
-    this.setCurrentPermissions();
-  },
-
-  initPermissions: function () {
-    this.perms.push(Ember.Object.create({
-      perm: 'createSurvey',
-      value: false
-    }));
-    this.perms.push(Ember.Object.create({
-      perm: 'editSurvey',
-      value: false
-    }));
-    this.perms.push(Ember.Object.create({
-      perm: 'uploadSurveyZipData',
-      value: false
-    }));
-    this.perms.push(Ember.Object.create({
-      perm: 'importDataReport',
-      value: false
-    }));
-    this.perms.push(Ember.Object.create({
-      perm: 'viewMessages',
-      value: false
-    }));
-    this.perms.push(Ember.Object.create({
-      perm: 'publishSurvey',
-      value: false
-    }));
-    this.perms.push(Ember.Object.create({
-      perm: 'mapData',
-      value: false
-    }));
-    this.perms.push(Ember.Object.create({
-      perm: 'setDataPrivacy',
-      value: false
-    }));
-    this.perms.push(Ember.Object.create({
-      perm: 'editRawData',
-      value: false
-    }));
-    this.perms.push(Ember.Object.create({
-      perm: 'deleteRawData',
-      value: false
-    }));
-    this.perms.push(Ember.Object.create({
-      perm: 'runReport',
-      value: false
-    }));
-    this.perms.push(Ember.Object.create({
-      perm: 'deleteSurvey',
-      value: false
-    }));
-    this.perms.push(Ember.Object.create({
-      perm: 'deleteSurveyGroup',
-      value: false
-    }));
-    this.perms.push(Ember.Object.create({
-      perm: 'addUser',
-      value: false
-    }));
-    this.perms.push(Ember.Object.create({
-      perm: 'editUser',
-      value: false
-    }));
-    this.perms.push(Ember.Object.create({
-      perm: 'deleteUser',
-      value: false
-    }));
-    this.perms.push(Ember.Object.create({
-      perm: 'approveSurvey',
-      value: false
-    }));
-    this.perms.push(Ember.Object.create({
-      perm: 'editEditorialContent',
-      value: false
-    }));
-  },
-
-  setUserPermissions: function () {
-    var user = true;
-    if (user === true) {
-      this.perms.findProperty('perm', 'createSurvey').value = true;
-      this.perms.findProperty('perm', 'editSurvey').value = true;
-      this.perms.findProperty('perm', 'uploadSurveyZipData').value = true;
-      this.perms.findProperty('perm', 'viewMessages').value = true;
-      this.perms.findProperty('perm', 'publishSurvey').value = true;
-      this.perms.findProperty('perm', 'mapData').value = true;
-      this.perms.findProperty('perm', 'setDataPrivacy').value = true;
-      this.perms.findProperty('perm', 'runReport').value = true;
-    }
-
-    if (user === true) {
-      this.perms.findProperty('perm', 'createSurvey').value = true;
-      this.perms.findProperty('perm', 'editSurvey').value = true;
-      this.perms.findProperty('perm', 'uploadSurveyZipData').value = true;
-      this.perms.findProperty('perm', 'importDataReport').value = true;
-      this.perms.findProperty('perm', 'viewMessages').value = true;
-      this.perms.findProperty('perm', 'publishSurvey').value = true;
-      this.perms.findProperty('perm', 'mapData').value = true;
-      this.perms.findProperty('perm', 'setDataPrivacy').value = true;
-      this.perms.findProperty('perm', 'runReport').value = true;
-      this.perms.findProperty('perm', 'editRawData').value = true;
-      this.perms.findProperty('perm', 'deleteRawData').value = true;
-      this.perms.findProperty('perm', 'approveSurvey').value = true;
-    }
-
-    if (user === true) {
-      this.perms.findProperty('perm', 'createSurvey').value = true;
-      this.perms.findProperty('perm', 'editSurvey').value = true;
-      this.perms.findProperty('perm', 'uploadSurveyZipData').value = true;
-      this.perms.findProperty('perm', 'importDataReport').value = true;
-      this.perms.findProperty('perm', 'viewMessages').value = true;
-      this.perms.findProperty('perm', 'publishSurvey').value = true;
-      this.perms.findProperty('perm', 'mapData').value = true;
-      this.perms.findProperty('perm', 'setDataPrivacy').value = true;
-      this.perms.findProperty('perm', 'runReport').value = true;
-      this.perms.findProperty('perm', 'editRawData').value = true;
-      this.perms.findProperty('perm', 'deleteRawData').value = true;
-      this.perms.findProperty('perm', 'approveSurvey').value = true;
-      this.perms.findProperty('perm', 'deleteSurvey').value = true;
-      this.perms.findProperty('perm', 'deleteSurveyGroup').value = true;
-      this.perms.findProperty('perm', 'addUser').value = true;
-      this.perms.findProperty('perm', 'editUser').value = true;
-      this.perms.findProperty('perm', 'deleteUser').value = true;
-    }
-
-  },
-
-  setCurrentPermissions: function () {
-    this.perms.forEach(function (item) {
-      //this.set(item.perm,item.value);
-    });
-  },
 
   /* Given an entity, process the permissions settings for the current user
     and return the permissions associated with that entity.  Entity is an Ember object*/
@@ -214,7 +75,7 @@ FLOW.permControl = Ember.Controller.create({
     return permissions && permissions.indexOf("DATA_UPDATE") > -1;
   },
 
-  canManageDevices: function () {
+  canManageDevices: Ember.computed(function () {
     var currentUserPermissions = FLOW.currentUser.get('pathPermissions');
     for (var perms in currentUserPermissions) {
       if (currentUserPermissions[perms].indexOf("DEVICE_MANAGE") > -1) {
@@ -222,9 +83,9 @@ FLOW.permControl = Ember.Controller.create({
       }
     }
     return false;
-  }.property(),
+  }).property(),
 
-  canManageCascadeResources: function () {
+  canManageCascadeResources: Ember.computed(function () {
     var currentUserPermissions = FLOW.currentUser.get('pathPermissions');
     for (var perms in currentUserPermissions) {
       if (currentUserPermissions[perms].indexOf("CASCADE_MANAGE") > -1) {
@@ -232,9 +93,9 @@ FLOW.permControl = Ember.Controller.create({
       }
     }
     return false;
-  }.property(),
+  }).property(),
 
-  canCleanData: function () {
+  canCleanData: Ember.computed(function () {
       var currentUserPermissions = FLOW.currentUser.get('pathPermissions');
       for (var perms in currentUserPermissions) {
           if (currentUserPermissions[perms].indexOf("DATA_CLEANING") > -1) {
@@ -242,9 +103,9 @@ FLOW.permControl = Ember.Controller.create({
           }
       }
       return false;
-  }.property(),
+  }).property(),
 
-  canManageDataAppoval: function () {
+  canManageDataAppoval: Ember.computed(function () {
       var currentUserPermissions = FLOW.currentUser.get('pathPermissions');
       for (var perms in currentUserPermissions) {
           if (currentUserPermissions[perms].indexOf("DATA_APPROVE_MANAGE") > -1) {
@@ -252,7 +113,7 @@ FLOW.permControl = Ember.Controller.create({
           }
       }
       return false;
-  }.property(),
+  }).property(),
 
   userCanViewData: function (entity) {
     var permissions;
diff --git a/Dashboard/app/js/lib/controllers/reports-controllers.js b/Dashboard/app/js/lib/controllers/reports-controllers.js
index 28afdb948e..ccc35c5cd6 100644
--- a/Dashboard/app/js/lib/controllers/reports-controllers.js
+++ b/Dashboard/app/js/lib/controllers/reports-controllers.js
@@ -1,3 +1,5 @@
+import observe from '../mixins/observe';
+
 FLOW.surveyQuestionSummaryControl = Ember.ArrayController.create({
   content: null,
 
@@ -32,7 +34,10 @@ FLOW.chartTypeControl = Ember.Object.create({
   ]
 });
 
-FLOW.ReportsController = Ember.ArrayController.extend({
+FLOW.ReportsController = Ember.ArrayController.extend(observe({
+  content: 'reportsObserver',
+  'content.isUpdating': 'reportsObserver',
+}), {
   sortProperties: ["createdDateTime"],
   sortAscending: false,
   content: null,
@@ -66,7 +71,7 @@ FLOW.ReportsController = Ember.ArrayController.extend({
         }, 10000);
       }
     }
-  }.observes('content', 'content.isUpdating'),
+  },
 
   refreshList: function(){
     var reports = this.get('content');
diff --git a/Dashboard/app/js/lib/controllers/survey-controllers.js b/Dashboard/app/js/lib/controllers/survey-controllers.js
index e14e68c05a..d174e8e47a 100644
--- a/Dashboard/app/js/lib/controllers/survey-controllers.js
+++ b/Dashboard/app/js/lib/controllers/survey-controllers.js
@@ -1,3 +1,4 @@
+import observe from '../mixins/observe';
 
 FLOW.questionTypeControl = Ember.Object.create({
   content: [
@@ -283,13 +284,14 @@ FLOW.projectControl = Ember.ArrayController.create({
   },
 
   /* Computed properties */
-  breadCrumbs: function() {
+  breadCrumbs: Ember.computed(function() {
     var result = [];
     var currentProject = this.get('currentProject');
     if (currentProject === null) {
       // current project is root
       return [];
     }
+    let project;
     var id = currentProject.get('keyId');
     while(id !== null && id !== 0) {
       project = FLOW.store.find(FLOW.SurveyGroup, id);
@@ -297,9 +299,9 @@ FLOW.projectControl = Ember.ArrayController.create({
       id = project.get('parentId');
     }
     return result.reverse();
-  }.property('@each', 'currentProject'),
+  }).property('@each', 'currentProject'),
 
-  currentFolders: function() {
+  currentFolders: Ember.computed(function() {
     var self = this;
     var currentProject = this.get('currentProject');
     var parentId = currentProject ? currentProject.get('keyId') : 0;
@@ -319,35 +321,35 @@ FLOW.projectControl = Ember.ArrayController.create({
         return aCode.localeCompare(bCode);
       }
     });
-  }.property('@each', 'currentProject', 'moveTarget'),
+  }).property('@each', 'currentProject', 'moveTarget'),
 
-  formCount: function() {
+  formCount: Ember.computed(function() {
     return FLOW.surveyControl.content && FLOW.surveyControl.content.get('length') || 0;
-  }.property('FLOW.surveyControl.content.@each'),
+  }).property('FLOW.surveyControl.content.@each'),
 
-  questionCount: function () {
+  questionCount: Ember.computed(function () {
     var questions = FLOW.questionControl.filterContent;
     return questions && questions.get('length') || 0;
-  }.property('FLOW.questionControl.filterContent.@each'),
+  }).property('FLOW.questionControl.filterContent.@each'),
 
-  hasForms: function() {
+  hasForms: Ember.computed(function() {
     return this.get('formCount') > 0;
-  }.property('this.formCount'),
+  }).property('this.formCount'),
 
-  currentProjectPath: function() {
+  currentProjectPath: Ember.computed(function() {
     var projectList = this.get('breadCrumbs');
     if(projectList.length === 0) {
         return ""; // root project folder
     } else {
         var path = "";
-        for(i = 0; i < projectList.length; i++){
+        for(let i = 0; i < projectList.length; i++){
             path += "/" + projectList[i].get('name');
         }
         return path;
     }
-  }.property('breadCrumbs'),
+  }).property('breadCrumbs'),
 
-  currentFolderPermissions: function() {
+  currentFolderPermissions: Ember.computed(function() {
       var currentFolder = this.get('currentProject');
       var currentUserPermissions = FLOW.currentUser.get('pathPermissions');
       var folderPermissions = [];
@@ -379,7 +381,7 @@ FLOW.projectControl = Ember.ArrayController.create({
       }
 
       var i;
-      for(i = 0; i < ancestorIds.length; i++){
+      for(let i = 0; i < ancestorIds.length; i++){
         if (ancestorIds[i] in currentUserPermissions) {
           currentUserPermissions[ancestorIds[i]].forEach(function(item){
             folderPermissions.push(item);
@@ -388,7 +390,7 @@ FLOW.projectControl = Ember.ArrayController.create({
       }
 
       return folderPermissions;
-  }.property('currentProject'),
+  }).property('currentProject'),
 
   /* Actions */
   selectProject: function(evt) {
@@ -552,7 +554,7 @@ FLOW.projectControl = Ember.ArrayController.create({
    * loading the appropriate approval steps depending on
    * the selected approval group
    */
-  dataApprovalGroup: function (key, value, previousValue) {
+  dataApprovalGroup: Ember.computed(function (key, value, previousValue) {
       var survey = this.get('currentProject');
 
       // setter
@@ -566,7 +568,7 @@ FLOW.projectControl = Ember.ArrayController.create({
 
       var groups = FLOW.router.approvalGroupListController.get('content');
       return groups && groups.filterProperty('keyId', approvalGroupId).get('firstObject');
-  }.property('this.currentProject.dataApprovalGroupId'),
+  }).property('this.currentProject.dataApprovalGroupId'),
 
   saveProject: function() {
     var currentProject = this.get('currentProject');
@@ -593,11 +595,23 @@ FLOW.projectControl = Ember.ArrayController.create({
 });
 
 
-FLOW.surveyControl = Ember.ArrayController.create({
+FLOW.surveyControl = Ember.ArrayController.create(observe({
+  'FLOW.selectedControl.selectedSurveyGroup': [
+    'setPublishedContent',
+    'orderForms',
+    'populate',
+  ],
+  'content.isLoaded': [
+    'orderForms',
+    'selectFirstForm',
+    'newLocale',
+  ],
+}), {
   content: null,
   publishedContent: null,
-  sortProperties: ['createdDateTime'],
+  sortProperties: ['name'],
   sortAscending: true,
+  orderedForms: null,
 
   setPublishedContent: function () {
     var sgId;
@@ -613,14 +627,59 @@ FLOW.surveyControl = Ember.ArrayController.create({
     } else {
       this.set('publishedContent', null);
     }
-  }.observes('FLOW.selectedControl.selectedSurveyGroup'),
+  },
+
+  orderForms: function () {
+    if (FLOW.selectedControl.get('selectedSurveyGroup') && FLOW.selectedControl.selectedSurveyGroup.get('keyId') > 0) {
+      var sgId = FLOW.selectedControl.selectedSurveyGroup.get('keyId'), self = this;
+      var forms = FLOW.store.filter(FLOW.Survey, function (item) {
+        return item.get('surveyGroupId') == sgId;
+      });
+      self.set('orderedForms', []);
+
+      if (forms.get('length') > 1 && FLOW.selectedControl.selectedSurveyGroup.get('monitoringGroup')) {
+        //find registration form if set
+        var regFormId, regForm = forms.find(function (item) {
+          return item.get('keyId') == FLOW.selectedControl.selectedSurveyGroup.get('newLocaleSurveyId');
+        });
+        if (regForm) {
+          regFormId = regForm.get('keyId');
+        } else {
+          regFormId = forms.get('firstObject').get('keyId'); //registration form not defined so assume first form is registration
+        }
+
+        self.orderedForms.push(forms.find(function (form) {
+          return form.get('keyId') == regFormId;
+        }));
+
+        forms.filter( function (form) {
+          return form.get('keyId') != regFormId;
+        }).sort(function (a, b) {
+          var nameA = a.get('name').toUpperCase();
+          var nameB = b.get('name').toUpperCase();
+          if (nameA < nameB) {
+            return -1;
+          }
+          if (nameA > nameB) {
+            return 1;
+          }
+          return 0;
+        }).forEach(function (form) {
+          self.orderedForms.push(form);
+        });
+      } else {
+        self.orderedForms.push(forms.find(function (form) {
+          return form.get('surveyGroupId') == sgId;
+        }));
+      }
+    }
+  },
 
   populateAll: function () {
     FLOW.store.find(FLOW.Survey);
   },
 
   populate: function () {
-
     var id;
     if (FLOW.selectedControl.get('selectedSurveyGroup')) {
       id = FLOW.selectedControl.selectedSurveyGroup.get('keyId');
@@ -633,7 +692,7 @@ FLOW.surveyControl = Ember.ArrayController.create({
     } else {
       this.set('content', null);
     }
-  }.observes('FLOW.selectedControl.selectedSurveyGroup'),
+  },
 
   selectFirstForm: function() {
     if (FLOW.selectedControl.selectedSurvey) return; // ignore if form is already selected
@@ -644,7 +703,7 @@ FLOW.surveyControl = Ember.ArrayController.create({
       }
       this.viewDataForms();
     }
-  }.observes('content.isLoaded'),
+  },
 
   refresh: function () {
 	  var sg = FLOW.selectedControl.get('selectedSurveyGroup');
@@ -657,7 +716,7 @@ FLOW.surveyControl = Ember.ArrayController.create({
 	  var newLocaleId = FLOW.selectedControl && FLOW.selectedControl.selectedSurveyGroup && FLOW.selectedControl.selectedSurveyGroup.get('newLocaleSurveyId');
 	  if(!this.get('content') || !this.get('content').get('isLoaded')) { return; }
 	  this.set('newLocaleSurvey', this.find(function (item) { return item.get('keyId') === newLocaleId; }));
-  }.observes('content.isLoaded'),
+  },
 
   publishSurvey: function () {
     var surveyId;
@@ -742,7 +801,7 @@ FLOW.surveyControl = Ember.ArrayController.create({
 
   /* retrieve the list of permissions associated with the currently
     active form */
-  currentFormPermissions: function() {
+  currentFormPermissions: Ember.computed(function() {
     var currentForm = FLOW.selectedControl.get('selectedSurvey');
     var currentUserPermissions = FLOW.currentUser.get('pathPermissions');
     var formPermissions = [];
@@ -757,7 +816,7 @@ FLOW.surveyControl = Ember.ArrayController.create({
     }
 
     var i;
-    for(i = 0; i < ancestorIds.length; i++){
+    for(let i = 0; i < ancestorIds.length; i++){
       if (ancestorIds[i] in currentUserPermissions) {
         currentUserPermissions[ancestorIds[i]].forEach(function(item){
           formPermissions.push(item);
@@ -767,7 +826,7 @@ FLOW.surveyControl = Ember.ArrayController.create({
 
     return formPermissions;
 
-  }.property('FLOW.selectedControl.selectedSurvey'),
+  }).property('FLOW.selectedControl.selectedSurvey'),
 
   viewDataForms: function() {
     var forms = [];
@@ -787,7 +846,9 @@ FLOW.surveyControl = Ember.ArrayController.create({
 });
 
 
-FLOW.questionGroupControl = Ember.ArrayController.create({
+FLOW.questionGroupControl = Ember.ArrayController.create(observe({
+  'FLOW.selectedControl.selectedSurvey': 'populate',  
+}), {
   sortProperties: ['order'],
   sortAscending: true,
   content: null,
@@ -815,17 +876,11 @@ FLOW.questionGroupControl = Ember.ArrayController.create({
       });
     }
     this.setFilteredContent();
-  }.observes('FLOW.selectedControl.selectedSurvey'),
-
-  getQuestionGroup: function (id) {
-	  FLOW.store.findQuery(FLOW.QuestionGroup,{
-		  questionGroupId: id
-	  });
   },
 
   // true if all items have been saved
   // used in models.js
-  allRecordsSaved: function () {
+  allRecordsSaved: Ember.computed(function () {
     var allSaved = true;
     if (Ember.none(this.get('content'))) {
       return true;
@@ -837,7 +892,7 @@ FLOW.questionGroupControl = Ember.ArrayController.create({
       });
       return allSaved;
     }
-  }.property('content.@each.isSaving'),
+  }).property('content.@each.isSaving'),
 
   // execute group delete
   deleteQuestionGroup: function (questionGroupId) {
@@ -889,7 +944,11 @@ FLOW.questionGroupControl = Ember.ArrayController.create({
 });
 
 
-FLOW.questionControl = Ember.ArrayController.create({
+FLOW.questionControl = Ember.ArrayController.create(observe({
+  'FLOW.selectedControl.selectedSurvey': ['populateAllQuestions', 'allQuestionsFilter'],
+  'FLOW.selectedControl.selectedQuestionGroup': 'setQGcontent',
+  'FLOW.selectedControl.selectedQuestion': 'setEarlierOptionQuestions',
+}), {
   content: null,
   OPTIONcontent: null,
   earlierOptionQuestions: null,
@@ -908,7 +967,7 @@ FLOW.questionControl = Ember.ArrayController.create({
         surveyId: sId
       }));
     }
-  }.observes('FLOW.selectedControl.selectedSurvey'),
+  },
 
   populateQuestionGroupQuestions: function (qgId) {
         this.set('content', FLOW.store.findQuery(FLOW.Question, {
@@ -962,7 +1021,7 @@ FLOW.questionControl = Ember.ArrayController.create({
     } else {
       this.set('filterContent', null);
     }
-  }.observes('FLOW.selectedControl.selectedSurvey'),
+  },
 
   setQGcontent: function () {
     if (FLOW.selectedControl.get('selectedQuestionGroup') && FLOW.selectedControl.selectedSurvey.get('keyId') > 0) {
@@ -971,15 +1030,15 @@ FLOW.questionControl = Ember.ArrayController.create({
         return item.get('questionGroupId') == qId;
       }));
     }
-  }.observes('FLOW.selectedControl.selectedQuestionGroup'),
+  },
 
-  geoshapeContent: function() {
+  geoshapeContent: Ember.computed(function() {
     var selectedSurvey = FLOW.selectedControl.get('selectedSurvey');
     var surveyId = selectedSurvey ? selectedSurvey.get('keyId') : null;
     return FLOW.store.filter(FLOW.Question, function (question) {
       return question.get('type') === 'GEOSHAPE' && surveyId === question.get('surveyId');
     });
-  }.property('content'),
+  }).property('content'),
 
   downloadOptionQuestions: function (surveyId) {
 	  this.set('OPTIONcontent', FLOW.store.findQuery(FLOW.Question, {
@@ -1016,7 +1075,7 @@ FLOW.questionControl = Ember.ArrayController.create({
 
       this.set('earlierOptionQuestions', optionQuestionList);
     }
-  }.observes('FLOW.selectedControl.selectedQuestion'),
+  },
 
   reorderQuestions: function (qgId, reorderPoint, reorderOperation) {
     var questionsInGroup = FLOW.store.filter(FLOW.Question, function (item) {
@@ -1054,7 +1113,7 @@ FLOW.questionControl = Ember.ArrayController.create({
 
   // true if all items have been saved
   // used in models.js
-  allRecordsSaved: function () {
+  allRecordsSaved: Ember.computed(function () {
     var allSaved = true;
     FLOW.questionControl.get('content').forEach(function (item) {
       if (item.get('isSaving')) {
@@ -1062,7 +1121,7 @@ FLOW.questionControl = Ember.ArrayController.create({
       }
     });
     return allSaved;
-  }.property('content.@each.isSaving')
+  }).property('content.@each.isSaving')
 });
 
 /*
@@ -1077,14 +1136,15 @@ FLOW.optionListControl = Ember.ArrayController.create({
  *
  */
 FLOW.questionOptionsControl = Ember.ArrayController.create({
+  sortProperties: ["order"],
   content: null,
   questionId: null,
-  emptyOptions: function () {
+  emptyOptions: Ember.computed(function () {
     var c = this.content;
     return !(c.get('length') > 0);
-  }.property('content.length'),
+  }).property('content.length'),
 
-  duplicateOptionNames: function () {
+  duplicateOptionNames: Ember.computed(function () {
     var c = this.content, uniqueText = [], emptyText = 0;
     c.forEach(function (option) {
       if (option.get('text') && option.get('text').trim()) {
@@ -1096,9 +1156,9 @@ FLOW.questionOptionsControl = Ember.ArrayController.create({
       }
     });
     return c.length > uniqueText.length && emptyText === 0;
-  }.property('@each.text','content.length'),
+  }).property('@each.text','content.length'),
 
-  emptyOptionNames: function () {
+  emptyOptionNames: Ember.computed(function () {
     var c = this.content, emptyText = 0;
     c.forEach(function (option) {
       // only take into account options with no text but with code filled in
@@ -1107,17 +1167,17 @@ FLOW.questionOptionsControl = Ember.ArrayController.create({
       }
     });
     return emptyText > 0;
-  }.property('@each.text','content.length'),
+  }).property('@each.text','content.length'),
 
-  partialOptionCodes: function () {
+  partialOptionCodes: Ember.computed(function () {
     var c = this.content;
     var codes = c.filter(function(option) {
       return option.get('code');
     });
     return codes.length && codes.length < c.length;
-  }.property('@each.code','content.length'),
+  }).property('@each.code','content.length'),
 
-  duplicateOptionCodes: function () {
+  duplicateOptionCodes: Ember.computed(function () {
     var c = this.content, uniqueCode = [], emptyCode = 0;
     c.forEach(function (option) {
       if (option.get('code') && option.get('code').trim()) {
@@ -1129,9 +1189,9 @@ FLOW.questionOptionsControl = Ember.ArrayController.create({
       }
     });
     return c.length > uniqueCode.length && emptyCode === 0;
-  }.property('@each.code','content.length'),
+  }).property('@each.code','content.length'),
 
-  disallowedCharacters: function () {
+  disallowedCharacters: Ember.computed(function () {
     var c = this.content, disallowedCharacters = 0;
     c.forEach(function (option) {
       if (option.get('code') && option.get('code').trim()) {
@@ -1142,9 +1202,9 @@ FLOW.questionOptionsControl = Ember.ArrayController.create({
     });
 
     return disallowedCharacters > 0;
-  }.property('@each.code','content.length'),
+  }).property('@each.code','content.length'),
 
-  reservedCode: function () {
+  reservedCode: Ember.computed(function () {
     var c = this.content, reservedCode = [];
     c.forEach(function (option) {
       if (option.get('code') && option.get('code').trim()) {
@@ -1155,7 +1215,19 @@ FLOW.questionOptionsControl = Ember.ArrayController.create({
     });
 
     return reservedCode.length > 0;
-  }.property('@each.code','content.length'),
+  }).property('@each.code','content.length'),
+
+  maxLength: Ember.computed(function () {
+    var c = this.content;
+    var longXters = c.find(function (option) {
+      if (option.get('text') && option.get('text').trim()) {
+        var optionText = option.get('text');
+        return optionText.length > 500;
+      }
+      return false;
+    });
+    return longXters;
+  }).property('@each.text','content.length'),
 
   /*
    *  Add two empty option objects to the options list.  This is used
@@ -1182,10 +1254,11 @@ FLOW.questionOptionsControl = Ember.ArrayController.create({
    */
   addOption: function() {
     var c = this.content;
+    var currentLength = c.get('length');
     c.addObject(Ember.Object.create({
         code: null,
         text: Ember.String.loc('_new_option'),
-        order: c.get('length') + 1,
+        order: currentLength + 1,
         questionId: this.get('questionId'),
     }));
   },
@@ -1224,7 +1297,7 @@ FLOW.questionOptionsControl = Ember.ArrayController.create({
 
       // trimmed whitespace
       option.set('text', text);
-      option.set('order', index);
+
       if (!option.get('keyId')) {
         FLOW.store.createRecord(FLOW.QuestionOption, option);
       }
@@ -1242,6 +1315,39 @@ FLOW.questionOptionsControl = Ember.ArrayController.create({
     if (option.get('keyId')) { // clear persisted versions
       option.deleteRecord();
     }
+
+    //reorder all options
+    c.forEach(function (item, index) {
+      item.set('order', index + 1);
+    });
+  },
+
+  moveOptionUp: function (event) {
+    var options = this.content, currentOption = event.view.content;
+
+    if (currentOption && currentOption.get('order') > 0) {
+      var previousOption = options.find(function (option) {
+        return option.get('order') == (currentOption.get('order') - 1);
+      });
+      var previousOptionOrder = previousOption.get('order');
+      var currentOptionOrder = currentOption.get('order');
+      previousOption.set('order', currentOptionOrder);
+      currentOption.set('order', previousOptionOrder);
+    }
+  },
+
+  moveOptionDown: function (event) {
+    var options = this.content, currentOption = event.view.content;
+
+    if (currentOption && currentOption.get('order') < options.get('length')) {
+      var nextOption = options.find(function (option) {
+        return option.get('order') == (currentOption.get('order') + 1);
+      });
+      var nextOptionOrder = nextOption.get('order');
+      var currentOptionOrder = currentOption.get('order');
+      nextOption.set('order', currentOptionOrder);
+      currentOption.set('order', nextOptionOrder);
+    }
   }
 });
 
@@ -1253,7 +1359,9 @@ FLOW.previewControl = Ember.ArrayController.create({
 });
 
 
-FLOW.notificationControl = Ember.ArrayController.create({
+FLOW.notificationControl = Ember.ArrayController.create(observe({
+  'FLOW.selectedControl.selectedSurvey': 'doFilterContent',
+}), {
   content: null,
   filterContent: null,
   sortProperties: ['notificationDestination'],
@@ -1277,11 +1385,14 @@ FLOW.notificationControl = Ember.ArrayController.create({
         return item.get('entityId') == sId;
       }));
     }
-  }.observes('FLOW.selectedControl.selectedSurvey')
+  },
 });
 
 
-FLOW.translationControl = Ember.ArrayController.create({
+FLOW.translationControl = Ember.ArrayController.create(observe({
+  'content.isLoaded': 'initiateData',
+  'this.selectedLanguage': 'lockWhenNewLangChosen',
+}), {
   itemArray: [],
   itemDict: {},
   translations: [],
@@ -1313,9 +1424,9 @@ FLOW.translationControl = Ember.ArrayController.create({
     this.set('isoLangs', tempArray);
   },
 
-  blockInteraction: function () {
+  blockInteraction: Ember.computed(function () {
     return this.get('noCurrentTrans') || this.get('newSelected');
-  }.property('noCurrentTrans', 'newSelected'),
+  }).property('noCurrentTrans', 'newSelected'),
 
   populate: function () {
     var id, questionGroupId, questionGroup;
@@ -1348,7 +1459,7 @@ FLOW.translationControl = Ember.ArrayController.create({
   },
 
   loadQuestionGroup: function (questionGroupId) {
-        var id;
+      var id, questionGroup;
 	    id = FLOW.selectedControl.selectedSurvey.get('keyId');
 	    questionGroup = FLOW.store.find(FLOW.QuestionGroup, questionGroupId);
 
@@ -1389,7 +1500,7 @@ FLOW.translationControl = Ember.ArrayController.create({
     	  this.putTranslationsInList();
       }
     }
-  }.observes('content.isLoaded'),
+  },
 
   resetTranslationFields: function () {
     this.get('itemArray').forEach(function (item) {
@@ -1475,7 +1586,7 @@ FLOW.translationControl = Ember.ArrayController.create({
       }
       this.set('newSelected', true);
     }
-  }.observes('this.selectedLanguage'),
+  },
 
   addTranslation: function () {
     var found = false,
@@ -1516,7 +1627,7 @@ FLOW.translationControl = Ember.ArrayController.create({
     tempHashDict = {};
 
     // put in survey stuff
-    survey = FLOW.selectedControl.get('selectedSurvey');
+    var survey = FLOW.selectedControl.get('selectedSurvey');
     tempArray.push(Ember.Object.create({
       keyId: survey.get('keyId'),
       type: "S",
@@ -1539,13 +1650,13 @@ FLOW.translationControl = Ember.ArrayController.create({
       }));
     }
     // put in questions
-    questions = FLOW.store.filter(FLOW.Question, function (item) {
+    var questions = FLOW.store.filter(FLOW.Question, function (item) {
       return item.get('questionGroupId') == questionGroupId;
     });
     questions.forEach(function (item) {
       questionGroup = FLOW.store.find(FLOW.QuestionGroup, item.get('questionGroupId'));
       qgOrder = parseInt(questionGroup.get('order'), 10);
-      qId = item.get('keyId');
+      var qId = item.get('keyId');
 
       tempArray.push(Ember.Object.create({
         keyId: item.get('keyId'),
@@ -1558,11 +1669,11 @@ FLOW.translationControl = Ember.ArrayController.create({
         hasTooltip: !Ember.empty(item.get('tip'))
       }));
       // for each question, put in question options
-      options = FLOW.store.filter(FLOW.QuestionOption, function (optionItem) {
+      var options = FLOW.store.filter(FLOW.QuestionOption, function (optionItem) {
         return optionItem.get('questionId') == qId;
       });
 
-      qOrder = parseInt(item.get('order'), 10);
+      var qOrder = parseInt(item.get('order'), 10);
       options.forEach(function (item) {
         tempArray.push(Ember.Object.create({
           keyId: item.get('keyId'),
@@ -1580,7 +1691,7 @@ FLOW.translationControl = Ember.ArrayController.create({
     	return a.get('order') - b.get('order');
     });
 
-    i = 0;
+    var i = 0;
     tempArray.forEach(function (item) {
       tempHashDict[item.get('type') + item.get('keyId')] = i;
       i++;
@@ -1655,13 +1766,13 @@ FLOW.translationControl = Ember.ArrayController.create({
 
 
   putTranslationsInList: function () {
-    var currLang, _self;
+    var currTrans, _self;
     _self = this;
     currTrans = this.get('currentTranslation');
     // only proceed if we have a language selected
     if (!Ember.none(currTrans)) {
       // get the translations with the right surveyId and the right language code
-      translations = FLOW.store.filter(FLOW.Translation, function (item) {
+      var translations = FLOW.store.filter(FLOW.Translation, function (item) {
         return (item.get('surveyId') == FLOW.selectedControl.selectedSurvey.get('keyId') && item.get('langCode') == currTrans);
       });
       translations.forEach(function (item) {
@@ -1704,12 +1815,12 @@ FLOW.translationControl = Ember.ArrayController.create({
             }
         } else {
           // we have an existing translation, so update it, if the text has changed
-          candidates = FLOW.store.filter(FLOW.Translation, function (item) {
+          var candidates = FLOW.store.filter(FLOW.Translation, function (item) {
             return item.get('keyId') == transId;
           });
 
           if (candidates.get('content').length > 0) {
-        	 existingTrans = candidates.objectAt(0);
+        	 var existingTrans = candidates.objectAt(0);
         	 // if the existing translation is different from the existing one, update it
         	 if (existingTrans.get('text') != translationText){
         		 changed = true;
@@ -1744,7 +1855,7 @@ FLOW.translationControl = Ember.ArrayController.create({
 
   // checks if unsaved translations are present, and if so, emits a warning
   unsavedTranslations: function () {
-	  var type, parentId, lan, transId, _self, unsaved;
+	  var type, parentId, surveyId, questionGroupId, lan, transId, _self, unsaved;
 	  _self = this;
 	  unsaved = false;
 	  this.get('itemArray').forEach(function (item) {
@@ -1781,13 +1892,13 @@ FLOW.translationControl = Ember.ArrayController.create({
 
   // after saving is complete, records insert themselves back into the translation item list
   saveTranslations: function () {
-    var type, parentId, lan, transId, _self;
+    var type, parentId, surveyId, questionGroupId, lan, transId, _self;
     _self = this;
+    surveyId = FLOW.selectedControl.selectedSurvey.get('keyId');
     FLOW.store.adapter.set('bulkCommit', true);
     this.get('itemArray').forEach(function (item) {
       type = item.type;
       parentId = item.keyId;
-      surveyId = FLOW.selectedControl.selectedSurvey.get('keyId');
       if (!Ember.none(FLOW.selectedControl.get('selectedQuestionGroup'))) {
         questionGroupId = FLOW.selectedControl.selectedQuestionGroup.get('keyId');
       } else {
@@ -1815,7 +1926,7 @@ FLOW.translationControl = Ember.ArrayController.create({
     });
 
     // make survey unpublished
-    survey = FLOW.store.find(FLOW.Survey,surveyId);
+    var survey = FLOW.store.find(FLOW.Survey, surveyId);
     if (!Ember.empty(survey)){
         survey.set('status','NOT_PUBLISHED');
     }
@@ -1847,6 +1958,12 @@ FLOW.CaddisflyResourceController = Ember.ArrayController.extend({
                 "name": test.name,
                 "brand": test.brand,
                 "uuid": test.uuid,
+                "multiParameter": test.multiParameter,
+                "sample": test.sample,
+                "device": test.device,
+                "model": test.model,
+                "results": test.results,
+                "reagents": 'reagents' in test ? test.reagents : []
             }));
         });
 
diff --git a/Dashboard/app/js/lib/controllers/survey-selection.js b/Dashboard/app/js/lib/controllers/survey-selection.js
index 44934f59e2..32dc4d6fb1 100644
--- a/Dashboard/app/js/lib/controllers/survey-selection.js
+++ b/Dashboard/app/js/lib/controllers/survey-selection.js
@@ -4,7 +4,7 @@ FLOW.SurveySelection = Ember.ObjectController.extend({
   selectionFilter: null,
 
   populate: function() {
-    selectionFilter = this.get('selectionFilter');
+    const selectionFilter = this.get('selectionFilter');
     if(selectionFilter) {
         this.surveyGroups = FLOW.store.filter(FLOW.SurveyGroup, selectionFilter);
     } else {
diff --git a/Dashboard/app/js/lib/core-common.js b/Dashboard/app/js/lib/core-common.js
index 8bbe777e61..2f2fe9eb10 100755
--- a/Dashboard/app/js/lib/core-common.js
+++ b/Dashboard/app/js/lib/core-common.js
@@ -1,4 +1,3 @@
-require('akvo-flow/templ-common');
 // Ember.LOG_BINDINGS = true;
 // Create the application
 window.FLOW = Ember.Application.create({
diff --git a/Dashboard/app/js/lib/main-public.js b/Dashboard/app/js/lib/main-public.js
index 4661e14942..ef7393234f 100755
--- a/Dashboard/app/js/lib/main-public.js
+++ b/Dashboard/app/js/lib/main-public.js
@@ -1,8 +1,16 @@
 require('akvo-flow/models/FLOWrest-adapter-v2-common');
 require('akvo-flow/models/models-public');
-require('akvo-flow/flowenv');
 require('akvo-flow/controllers/controllers-public');
 require('akvo-flow/views/views-public');
 require('akvo-flow/router/router-public');
+require('akvo-flow/version');
+require('akvo-flow/analytics');
+require('../vendor/Google');
+
+require('../../css/screen.scss');
+
+const regionBias = FLOW.Env.googleMapsRegionBias;
+const region = regionBias ? `&region=${regionBias}` : '';
+document.write(`<script src="https://maps.google.com/maps/api/js?v=3.2&sensor=false${region}"><\/script>`);
 
 FLOW.initialize();
diff --git a/Dashboard/app/js/lib/main.js b/Dashboard/app/js/lib/main.js
index 01b467c7b0..86cee7caf8 100755
--- a/Dashboard/app/js/lib/main.js
+++ b/Dashboard/app/js/lib/main.js
@@ -1,8 +1,23 @@
+require('../plugins/flowDashboard');
+require('../plugins/geocells');
+require('../plugins/tooltip');
+
+require('akvo-flow/flowenv');
 require('akvo-flow/models/FLOWrest-adapter-v2-common');
 require('akvo-flow/models/models');
-require('akvo-flow/flowenv');
 require('akvo-flow/controllers/controllers');
 require('akvo-flow/views/views');
 require('akvo-flow/router/router');
+require('akvo-flow/version');
+require('akvo-flow/analytics');
+require('../vendor/Google');
+
+require('../../css/screen.scss');
+
+if (FLOW.Env.mapsProvider == 'google') {
+  var regionBias = FLOW.Env.googleMapsRegionBias;
+  var region = regionBias ? '&region=' + regionBias : '';
+  document.write('<script src="https://maps.google.com/maps/api/js?key=AIzaSyBZU7kLJ75VlTlC5Qrfi1n1N-5hJYProuQ' + region + '"><\/script>');
+}
 
 FLOW.initialize();
diff --git a/Dashboard/app/js/lib/mixins/observe.js b/Dashboard/app/js/lib/mixins/observe.js
new file mode 100644
index 0000000000..dce0028a4b
--- /dev/null
+++ b/Dashboard/app/js/lib/mixins/observe.js
@@ -0,0 +1,19 @@
+import { isArray, isString } from 'lodash';
+
+export default mappings => Ember.Mixin.create({
+  init() {
+    this._super();
+    Object.keys(mappings).forEach((key) => {
+      if (!key || (isString(key) && !key.length)) {
+        throw new Error('observer key not set');
+      }
+      const handler = mappings[key];
+      if (!handler || (isString(handler) && !handler.length)) {
+        throw new Error('observer method not set');
+      }
+      (isArray(handler) ? handler : [handler]).forEach((h) => {
+        this.addObserver(key, this, h);
+      });
+    });
+  },
+});
diff --git a/Dashboard/app/js/lib/mixins/template.js b/Dashboard/app/js/lib/mixins/template.js
new file mode 100644
index 0000000000..a4255e05a9
--- /dev/null
+++ b/Dashboard/app/js/lib/mixins/template.js
@@ -0,0 +1,3 @@
+export default templateName => Ember.Mixin.create({
+  template: Ember.Handlebars.compile(require(`templates/${templateName}`))
+});
diff --git a/Dashboard/app/js/lib/models/FLOWrest-adapter-v2-common.js b/Dashboard/app/js/lib/models/FLOWrest-adapter-v2-common.js
index 581f3e0444..e5bda2dcaf 100644
--- a/Dashboard/app/js/lib/models/FLOWrest-adapter-v2-common.js
+++ b/Dashboard/app/js/lib/models/FLOWrest-adapter-v2-common.js
@@ -13,7 +13,7 @@ DS.FLOWRESTAdapter = DS.RESTAdapter.extend({
   }),
 
   sideload: function (store, type, json, root) {
-    var msg, status, metaObj;
+    var msg, status, metaObj, keyId;
     this._super(store, type, json, root);
 
     this.setQueryCursor(type, json);
diff --git a/Dashboard/app/js/lib/models/models-public.js b/Dashboard/app/js/lib/models/models-public.js
index 582dce8db3..fee15fb2b7 100644
--- a/Dashboard/app/js/lib/models/models-public.js
+++ b/Dashboard/app/js/lib/models/models-public.js
@@ -3,8 +3,12 @@
 // ***********************************************//
 require('akvo-flow/core-common');
 require('akvo-flow/models/store_def-common');
+import observe from '../mixins/observe';
 
-FLOW.BaseModel = DS.Model.extend({
+FLOW.BaseModel = DS.Model.extend(observe({
+  isSaving: 'anySaving',
+  isDirty: 'anySaving',
+}), {
   keyId: DS.attr('number'),
   savingStatus: null,
 
@@ -18,7 +22,7 @@ FLOW.BaseModel = DS.Model.extend({
       FLOW.savingMessageControl.checkSaving();
     }
     this.set('savingStatus', (this.get('isSaving') || this.get('isDirty')));
-  }.observes('isSaving', 'isDirty')
+  },
 
 });
 
diff --git a/Dashboard/app/js/lib/models/models.js b/Dashboard/app/js/lib/models/models.js
index 0c8454c7cd..385d7cd064 100644
--- a/Dashboard/app/js/lib/models/models.js
+++ b/Dashboard/app/js/lib/models/models.js
@@ -3,8 +3,12 @@
 // ***********************************************//
 require('akvo-flow/core-common');
 require('akvo-flow/models/store_def-common');
+import observe from '../mixins/observe';
 
-FLOW.BaseModel = DS.Model.extend({
+FLOW.BaseModel = DS.Model.extend(observe({
+  isSaving: 'anySaving',
+  isDirty: 'anySaving',
+}), {
   keyId: DS.attr('number'),
   savingStatus: null,
 
@@ -18,17 +22,19 @@ FLOW.BaseModel = DS.Model.extend({
       FLOW.savingMessageControl.checkSaving();
     }
     this.set('savingStatus', (this.get('isSaving') || this.get('isDirty')));
-  }.observes('isSaving', 'isDirty')
+  },
 });
 
 FLOW.CaddisflyTestDefinition = Ember.Object.extend({
     name: null,
+    multiParameter: null,
+    sample: null,
+    device: null,
     brand: null,
+    model: null,
     uuid: null,
-
-    displayName: function() {
-        return this.get('name') + " (" + this.get('brand') +")";
-    }.property(''),
+    results: [],
+    reagents: []
 });
 
 FLOW.CascadeResource = FLOW.BaseModel.extend({
@@ -162,9 +168,9 @@ FLOW.Survey = FLOW.BaseModel.extend({
   // used in the assignment edit page, not saved to backend
   surveyGroupName: null,
 
-  allowEdit: function () {
+  allowEdit: Ember.computed(function () {
 	  return !this.get('isNew') && this.get('status') !== 'COPYING';
-  }.property('status', 'isNew')
+  }).property('status', 'isNew')
 
 });
 
@@ -447,7 +453,9 @@ FLOW.Message = FLOW.BaseModel.extend({
 
 FLOW.Action = FLOW.BaseModel.extend({});
 
-FLOW.Translation = FLOW.BaseModel.extend({
+FLOW.Translation = FLOW.BaseModel.extend(observe({
+  'this.keyId': 'didCreateId',
+}), {
   didUpdate: function () {
     FLOW.translationControl.putSingleTranslationInList(this.get('parentType'), this.get('parentId'), this.get('text'), this.get('keyId'), false);
   },
@@ -463,7 +471,7 @@ FLOW.Translation = FLOW.BaseModel.extend({
     if (!Ember.none(this.get('keyId')) && this.get('keyId') > 0) {
       FLOW.translationControl.putSingleTranslationInList(this.get('parentType'), this.get('parentId'), this.get('text'), this.get('keyId'), false);
     }
-  }.observes('this.keyId'),
+  },
 
   didDelete: function () {
     FLOW.translationControl.putSingleTranslationInList(this.get('parentType'), this.get('parentId'), null, null, true);
diff --git a/Dashboard/app/js/lib/router/router.js b/Dashboard/app/js/lib/router/router.js
index 3b35117887..471f9a4cd7 100644
--- a/Dashboard/app/js/lib/router/router.js
+++ b/Dashboard/app/js/lib/router/router.js
@@ -446,6 +446,7 @@ FLOW.Router = Ember.Router.extend({
     navMaps: Ember.Route.extend({
       route: '/maps',
       connectOutlets: function (router, context) {
+        FLOW.selectedControl.set('selectedSurveyGroup', null);
         router.get('applicationController').connectOutlet('navMaps');
         router.set('navigationController.selected', 'navMaps');
       }
diff --git a/Dashboard/app/js/lib/templ-common.js b/Dashboard/app/js/lib/templ-common.js
deleted file mode 100755
index f240bac6ae..0000000000
--- a/Dashboard/app/js/lib/templ-common.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var get = Ember.get,
-  fmt = Ember.String.fmt;
-
-Ember.View.reopen({
-  templateForName: function (name, type) {
-    if (!name) {
-      return;
-    }
-
-    var templates = get(this, 'templates'),
-      template = get(templates, name);
-
-    if (!template) {
-      try {
-        template = require('akvo-flow/templates/' + name);
-      } catch (e) {
-        throw new Ember.Error(fmt('%@ - Unable to find %@ "%@".', [this, type, name]));
-      }
-    }
-
-    return template;
-  }
-});
diff --git a/Dashboard/app/js/lib/version.js b/Dashboard/app/js/lib/version.js
new file mode 100644
index 0000000000..390b498c9e
--- /dev/null
+++ b/Dashboard/app/js/lib/version.js
@@ -0,0 +1,3 @@
+/* globals __VERSION__ */
+
+Ember.Handlebars.registerHelper('__VERSION__', () => __VERSION__);
diff --git a/Dashboard/app/js/lib/views/data/bulk-upload-view.js b/Dashboard/app/js/lib/views/data/bulk-upload-view.js
index 22b065d978..49af920c80 100644
--- a/Dashboard/app/js/lib/views/data/bulk-upload-view.js
+++ b/Dashboard/app/js/lib/views/data/bulk-upload-view.js
@@ -24,9 +24,9 @@ FLOW.uploader = Ember.Object.create({
     return this.get('r').assignBrowse(el);
   },
 
-  support: function () {
+  support: Ember.computed(function () {
     return this.get('r').support;
-  }.property(),
+  }).property(),
 
   upload: function () {
     return this.get('r').upload();
diff --git a/Dashboard/app/js/lib/views/data/cascade-resources-view.js b/Dashboard/app/js/lib/views/data/cascade-resources-view.js
index 09f522ec23..81fd2abea4 100644
--- a/Dashboard/app/js/lib/views/data/cascade-resources-view.js
+++ b/Dashboard/app/js/lib/views/data/cascade-resources-view.js
@@ -1,3 +1,5 @@
+import observe from '../../mixins/observe';
+
 function capitaliseFirstLetter(string) {
   return string.charAt(0).toUpperCase() + string.slice(1);
 }
@@ -8,7 +10,9 @@ if (!String.prototype.trim) {
 
 
 
-FLOW.CascadeResourceView = FLOW.View.extend({
+FLOW.CascadeResourceView = FLOW.View.extend(observe({
+	'FLOW.selectedControl.selectedCascadeResource': 'resourceSelected',
+}), {
 	showNewCascadeField: false,
 	cascadeResourceName:null,
 	showImportDialog:false,
@@ -108,9 +112,9 @@ FLOW.CascadeResourceView = FLOW.View.extend({
 		FLOW.cascadeResourceControl.setDisplayLevelNames();
 	},
 
-	oneSelected: function(){
+	oneSelected: Ember.computed(function(){
 		return !Ember.empty(FLOW.selectedControl.get('selectedCascadeResource'));
-	}.property('FLOW.selectedControl.selectedCascadeResource').cacheable(),
+	}).property('FLOW.selectedControl.selectedCascadeResource').cacheable(),
 
 	resourceSelected: function(){
 		if (!Ember.empty(FLOW.selectedControl.get('selectedCascadeResource'))){
@@ -123,7 +127,7 @@ FLOW.CascadeResourceView = FLOW.View.extend({
 			FLOW.cascadeResourceControl.setDisplayLevelNames();
 			FLOW.cascadeNodeControl.toggleSelectedNodeTrigger();
 		}
-	}.observes('FLOW.selectedControl.selectedCascadeResource'),
+	},
 
 	// fired when 'save' is clicked while showing new cascade text field. Saves new cascade resource to the data store
 	saveNewCascadeResource: function () {
@@ -148,21 +152,21 @@ FLOW.CascadeResourceView = FLOW.View.extend({
 	  this.set('showNewCascadeField', false);
 	},
 
-	hideColumn2: function () {
+	hideColumn2: Ember.computed(function () {
 		var cascade = FLOW.selectedControl.selectedCascadeResource;
 		if (!cascade) {
 			return false;
 		}
 		return cascade.get('numLevels') < 2;
-	}.property('FLOW.selectedControl.selectedCascadeResource', 'FLOW.selectedControl.selectedCascadeResource.numLevels'),
+	}).property('FLOW.selectedControl.selectedCascadeResource', 'FLOW.selectedControl.selectedCascadeResource.numLevels'),
 
-	hideColumn3: function() {
+	hideColumn3: Ember.computed(function() {
 		var cascade = FLOW.selectedControl.selectedCascadeResource;
 		if (!cascade) {
 			return false;
 		}
 		return cascade.get('numLevels') < 3;
-	}.property('FLOW.selectedControl.selectedCascadeResource', 'FLOW.selectedControl.selectedCascadeResource.numLevels')
+	}).property('FLOW.selectedControl.selectedCascadeResource', 'FLOW.selectedControl.selectedCascadeResource.numLevels')
 });
 
 FLOW.CascadeSecondNavView = FLOW.View.extend({
@@ -170,19 +174,19 @@ FLOW.CascadeSecondNavView = FLOW.View.extend({
 	content: null,
 	classNameBindings: 'display:disable'.w(),
 
-	display: function(){
+	display: Ember.computed(function(){
 		if (this.get('dir') == "up"){
 			return !this.get('showGoUpLevel');
 		} else return !this.get('showGoDownLevel');
-	}.property('this.showGoUpLevel','this.showGoUpLevel'),
+	}).property('this.showGoUpLevel','this.showGoUpLevel'),
 
-	showGoUpLevel: function(){
+	showGoUpLevel: Ember.computed(function(){
 		return FLOW.selectedControl.selectedCascadeResource && (FLOW.cascadeNodeControl.get('skip') + 3 < FLOW.selectedControl.selectedCascadeResource.get('numLevels'));
-	}.property('FLOW.cascadeNodeControl.skip', 'FLOW.selectedControl.selectedCascadeResource'),
+	}).property('FLOW.cascadeNodeControl.skip', 'FLOW.selectedControl.selectedCascadeResource'),
 
-	showGoDownLevel: function(){
+	showGoDownLevel: Ember.computed(function(){
 		return FLOW.cascadeNodeControl.get('skip') > 0;
-	}.property('FLOW.cascadeNodeControl.skip','FLOW.selectedControl.selectedCascadeResource'),
+	}).property('FLOW.cascadeNodeControl.skip','FLOW.selectedControl.selectedCascadeResource'),
 
 	goUpLevel: function(){
 		FLOW.cascadeNodeControl.set('skip', FLOW.cascadeNodeControl.get('skip') + 1);
@@ -204,11 +208,11 @@ FLOW.CascadeLevelBreadcrumbView = FLOW.View.extend({
 	content: null,
 	classNameBindings: 'offscreen:offScreen'.w(),
 
-	offscreen: function() {
+	offscreen: Ember.computed(function() {
 		var skip = FLOW.cascadeNodeControl.get('skip');
 		var level = this.content.get('level');
 		return ((level < skip + 1) || (level > skip + 3));
-	}.property('FLOW.cascadeNodeControl.skip', 'FLOW.selectedControl.selectedCascadeResource'),
+	}).property('FLOW.cascadeNodeControl.skip', 'FLOW.selectedControl.selectedCascadeResource'),
 
 	adaptColView: function(){
 		var skip = FLOW.cascadeNodeControl.get('skip');
@@ -278,7 +282,7 @@ FLOW.CascadeNodeView = FLOW.View.extend({
 	cascadeNodeName: null,
 	cascadeNodeCode:null,
 
-	showInputField:function(){
+	showInputField: Ember.computed(function(){
 		var skip = FLOW.cascadeNodeControl.get('skip');
 
 		// determines if we should show an input field in this column
@@ -288,7 +292,7 @@ FLOW.CascadeNodeView = FLOW.View.extend({
 		}
 		return (!Ember.empty(FLOW.cascadeNodeControl.selectedNode[skip + this.get('col') - 1]) &&
 				!Ember.empty(FLOW.cascadeNodeControl.selectedNode[skip + this.get('col') - 1].get('keyId')));
-	}.property('FLOW.cascadeNodeControl.selectedNodeTrigger').cacheable(),
+	}).property('FLOW.cascadeNodeControl.selectedNodeTrigger').cacheable(),
 
 	addNewNode: function() {
 		var newNodeStringArray, level, nodes, exists, item, itemTrim, levelNames;
@@ -333,7 +337,7 @@ FLOW.CascadeNodeItemView = FLOW.View.extend({
 	newName:null,
 
 	// true if the node group is selected. Used to set proper display class
-	amSelected: function () {
+	amSelected: Ember.computed(function () {
 	    var selected = FLOW.cascadeNodeControl.get('selectedNode')[this.get('col') + FLOW.cascadeNodeControl.get('skip')];
 	    if (selected) {
 	      var amSelected = (this.content.get('name') === FLOW.cascadeNodeControl.get('selectedNode')[this.get('col') + FLOW.cascadeNodeControl.get('skip')].get('name'));
@@ -341,7 +345,7 @@ FLOW.CascadeNodeItemView = FLOW.View.extend({
 	    } else {
 	      return false;
 	    }
-	}.property('FLOW.cascadeNodeControl.selectedNodeTrigger').cacheable(),
+	}).property('FLOW.cascadeNodeControl.selectedNodeTrigger').cacheable(),
 
 	deleteNode:function() {
 		FLOW.cascadeNodeControl.emptyNodes(this.get('col') + FLOW.cascadeNodeControl.get('skip') + 1);
diff --git a/Dashboard/app/js/lib/views/data/data-approval-views.js b/Dashboard/app/js/lib/views/data/data-approval-views.js
index 8b84ee5d7e..41c68c2298 100644
--- a/Dashboard/app/js/lib/views/data/data-approval-views.js
+++ b/Dashboard/app/js/lib/views/data/data-approval-views.js
@@ -1,3 +1,5 @@
+import template from '../../mixins/template';
+
 FLOW.DataApprovalView = Ember.View.extend({
     /*
      * This is a wrapper template for the data approval tab.
@@ -11,18 +13,13 @@ FLOW.DataApprovalView = Ember.View.extend({
     template: Ember.Handlebars.compile('{{outlet approvalMain}}'),
 });
 
-FLOW.ApprovalGroupListView = Ember.View.extend({
-    templateName: 'navData/data-approval-group-list'
-});
+FLOW.ApprovalGroupListView = Ember.View.extend(template('navData/data-approval-group-list'));
 
-FLOW.ApprovalGroupView = Ember.View.extend({
-    templateName: 'navData/data-approval-group',
+FLOW.ApprovalGroupView = Ember.View.extend(template('navData/data-approval-group'), {
 
     approvalTypeOptions: [{label: Ember.String.loc('_ordered'), optionValue: "ordered"},
                           {label: Ember.String.loc('_unordered'), optionValue: "unordered"}],
 });
 
 
-FLOW.ApprovalStepsView = Ember.View.extend({
-    templateName: 'navData/data-approval-steps',
-});
\ No newline at end of file
+FLOW.ApprovalStepsView = Ember.View.extend(template('navData/data-approval-steps'));
diff --git a/Dashboard/app/js/lib/views/data/inspect-data-table-views.js b/Dashboard/app/js/lib/views/data/inspect-data-table-views.js
index 709f1230ce..1326206b2b 100644
--- a/Dashboard/app/js/lib/views/data/inspect-data-table-views.js
+++ b/Dashboard/app/js/lib/views/data/inspect-data-table-views.js
@@ -1,4 +1,8 @@
-FLOW.inspectDataTableView = FLOW.View.extend({
+import observe from '../../mixins/observe';
+
+FLOW.inspectDataTableView = FLOW.View.extend(observe({
+  'FLOW.selectedControl.selectedSurvey': 'watchSurveySelection',
+}), {
   selectedSurvey: null,
   surveyInstanceId: null,
   surveyId: null,
@@ -17,11 +21,11 @@ FLOW.inspectDataTableView = FLOW.View.extend({
   siString: null,
   missingSurvey:false,
   
-  form: function() {
+  form: Ember.computed(function() {
     if (FLOW.selectedControl.get('selectedSurvey')) {
       return FLOW.selectedControl.get('selectedSurvey');
     }
-  }.property('FLOW.selectedControl.selectedSurvey'),
+  }).property('FLOW.selectedControl.selectedSurvey'),
 
   init: function () {
     this._super();
@@ -53,12 +57,12 @@ FLOW.inspectDataTableView = FLOW.View.extend({
       if (FLOW.selectedControl.get('selectedSurvey')!== null) {
          this.set('missingSurvey', false)  
       }  
-  }.observes('FLOW.selectedControl.selectedSurvey'),
+  },
 
   doInstanceQuery: function () {
     this.set('beginDate', Date.parse(FLOW.dateControl.get('fromDate')));
     // we add 24 hours to the date, in order to make the date search inclusive.
-    dayInMilliseconds = 24 * 60 * 60 * 1000;
+    var dayInMilliseconds = 24 * 60 * 60 * 1000;
     this.set('endDate', Date.parse(FLOW.dateControl.get('toDate')) + dayInMilliseconds);
 
     // we shouldn't be sending NaN
@@ -126,14 +130,14 @@ FLOW.inspectDataTableView = FLOW.View.extend({
 
   // If the number of items in the previous call was 20 (a full page) we assume that there are more.
   // This is not foolproof, but will only lead to an empty next page in 1/20 of the cases
-  hasNextPage: function () {
+  hasNextPage: Ember.computed(function () {
     return FLOW.metaControl.get('numSILoaded') == 20;
-  }.property('FLOW.metaControl.numSILoaded'),
+  }).property('FLOW.metaControl.numSILoaded'),
 
   // not perfect yet, sometimes previous link is shown while there are no previous pages.
-  hasPrevPage: function () {
+  hasPrevPage: Ember.computed(function () {
     return FLOW.surveyInstanceControl.get('pageNumber');
-  }.property('FLOW.surveyInstanceControl.pageNumber'),
+  }).property('FLOW.surveyInstanceControl.pageNumber'),
 
   downloadQuestionsIfNeeded: function () {
     var si, surveyId;
@@ -158,9 +162,9 @@ FLOW.inspectDataTableView = FLOW.View.extend({
     this.set('showEditSurveyInstanceWindowBool', true);
   },
 
-  showEditResponseLink: function () {
+  showEditResponseLink: Ember.computed(function () {
     return FLOW.permControl.canEditResponses(this.get('form'));
-  }.property('this.form'),
+  }).property('this.form'),
 
   doCloseEditSIWindow: function (event) {
     this.set('showEditSurveyInstanceWindowBool', false);
@@ -218,10 +222,10 @@ FLOW.inspectDataTableView = FLOW.View.extend({
     }
   },
 
-  showSurveyInstanceDeleteButton: function() {
+  showSurveyInstanceDeleteButton: Ember.computed(function() {
     var permissions = FLOW.surveyControl.get('currentFormPermissions');
     return permissions.indexOf("DATA_DELETE") >= 0;
-  }.property('FLOW.selectedControl.selectedSurvey'),
+  }).property('FLOW.selectedControl.selectedSurvey'),
 
   doShowDeleteSIDialog: function (event) {
     FLOW.dialogControl.set('activeAction', 'delSI');
@@ -241,34 +245,34 @@ FLOW.inspectDataTableView = FLOW.View.extend({
     this.set('showEditSurveyInstanceWindowBool', false);
   },
 
-  validSurveyInstanceId: function() {
+  validSurveyInstanceId: Ember.computed(function() {
     return this.surveyInstanceId === null ||
       this.surveyInstanceId === "" ||
       this.surveyInstanceId.match(/^\d+$/);
-  }.property('this.surveyInstanceId'),
+  }).property('this.surveyInstanceId'),
 
-  noResults: function() {
+  noResults: Ember.computed(function() {
     var content = FLOW.surveyInstanceControl.get('content');
     if (content && content.get('isLoaded')) {
       return content.get('length') === 0;
     } else {
       return false;
     }
-  }.property('FLOW.surveyInstanceControl.content', 'FLOW.surveyInstanceControl.content.isLoaded'),
-  
+  }).property('FLOW.surveyInstanceControl.content', 'FLOW.surveyInstanceControl.content.isLoaded'),
+
   //clearing the SI records when the user navigates away from inspect-tab.
   willDestroyElement: function () {
      FLOW.surveyInstanceControl.set('currentContents', null);
      FLOW.metaControl.set('numSILoaded', null);
-     FLOW.surveyInstanceControl.set('pageNumber', 0);     
+     FLOW.surveyInstanceControl.set('pageNumber', 0);
   }
-  
+
 });
 
 FLOW.DataItemView = FLOW.View.extend({
   tagName: 'span',
   deleteSI: function () {
-    var SI,slKey, sl;
+    var SI, slKey, SL;
     SI = FLOW.store.find(FLOW.SurveyInstance, this.content.get('keyId'));
     if (SI !== null) {
         // check if we also have the data point loaded locally
@@ -283,7 +287,7 @@ FLOW.DataItemView = FLOW.View.extend({
             // if not, we also need to not show the locale any more.
             // it will also be deleted automatically in the backend,
             // so this is just to not show it in the UI
-            SiList = FLOW.store.filter(FLOW.SurveyInstance,function(item){
+            var SiList = FLOW.store.filter(FLOW.SurveyInstance,function(item){
                 return item.get('surveyedLocaleId') == slKey;
             });
             if (SiList.get('content').length == 1) {
@@ -319,7 +323,7 @@ FLOW.DataNumView = FLOW.View.extend({
   tagName: 'span',
   pageNumber: 0,
   content: null,
-  rownum: function () {
+  rownum: Ember.computed(function () {
      return this.get("_parentView.contentIndex") + 1 + 20 * this.get('pageNumber');
-  }.property(),
+  }).property(),
 });
diff --git a/Dashboard/app/js/lib/views/data/monitoring-data-table-view.js b/Dashboard/app/js/lib/views/data/monitoring-data-table-view.js
index 3b067a5430..4a579bb63d 100644
--- a/Dashboard/app/js/lib/views/data/monitoring-data-table-view.js
+++ b/Dashboard/app/js/lib/views/data/monitoring-data-table-view.js
@@ -1,11 +1,16 @@
-FLOW.MonitoringDataTableView = FLOW.View.extend({
+import observe from '../../mixins/observe';
+import template from '../../mixins/template';
+
+FLOW.MonitoringDataTableView = FLOW.View.extend(observe({
+    'FLOW.selectedControl.selectedSurveyGroup': 'watchSurveySelection',
+}), {
   showingDetailsDialog: false,
   cursorStart: null,
   missingSurvey:false,
 
-  pageNumber: function(){
+  pageNumber: Ember.computed(function(){
 	return FLOW.router.surveyedLocaleController.get('pageNumber');
-  }.property('FLOW.router.surveyedLocaleController.pageNumber'),
+  }).property('FLOW.router.surveyedLocaleController.pageNumber'),
 
   showDetailsDialog: function (evt) {
 	FLOW.surveyInstanceControl.set('content', FLOW.store.findQuery(FLOW.SurveyInstance, {
@@ -14,9 +19,9 @@ FLOW.MonitoringDataTableView = FLOW.View.extend({
     this.toggleProperty('showingDetailsDialog');
   },
 
-  showApprovalStatusColumn: function () {
+  showApprovalStatusColumn: Ember.computed(function () {
       return FLOW.Env.enableDataApproval;
-  }.property(),
+  }).property(),
 
   closeDetailsDialog: function () {
     this.toggleProperty('showingDetailsDialog');
@@ -26,13 +31,13 @@ FLOW.MonitoringDataTableView = FLOW.View.extend({
     FLOW.questionAnswerControl.doQuestionAnswerQuery(evt.context);
     $('.si_details').hide();
     $('tr[data-flow-id="si_details_' + evt.context.get('keyId') + '"]').show();
-  },
-    
-  watchSurveySelection: function(){
-     if (FLOW.selectedControl.get('selectedSurveyGroup') !== null) {
-        this.set('missingSurvey', false)
-     }
-  }.observes('FLOW.selectedControl.selectedSurveyGroup'),
+  },
+    
+  watchSurveySelection: function(){
+     if (FLOW.selectedControl.get('selectedSurveyGroup') !== null) {
+        this.set('missingSurvey', false)
+     }
+  },
 
   findSurveyedLocale: function (evt) {
 	  var ident = this.get('identifier'),
@@ -41,9 +46,9 @@ FLOW.MonitoringDataTableView = FLOW.View.extend({
 	      cursorType = FLOW.metaControl.get('cursorType'),
         criteria = {};
     //check if the survey is not selected, then highlight the dropdown
-     if (FLOW.selectedControl.get('selectedSurveyGroup') === null) {
-       this.set('missingSurvey', true)
-       return;
+     if (FLOW.selectedControl.get('selectedSurveyGroup') === null) {
+       this.set('missingSurvey', true)
+       return;
      }
     
 	  if (ident) {
@@ -78,12 +83,12 @@ FLOW.MonitoringDataTableView = FLOW.View.extend({
       }
   },
   
-  noResults: function () {
+  noResults: Ember.computed(function () {
     var content = FLOW.router.surveyedLocaleController.get('content');
     if (content && content.get('isLoaded')) {
         return content.get('length') === 0;
     }
-  }.property('FLOW.router.surveyedLocaleController.content','FLOW.router.surveyedLocaleController.content.isLoaded'),
+  }).property('FLOW.router.surveyedLocaleController.content','FLOW.router.surveyedLocaleController.content.isLoaded'),
 
   doNextPage: function () {
 	var cursorArray, cursorStart;
@@ -103,13 +108,13 @@ FLOW.MonitoringDataTableView = FLOW.View.extend({
     FLOW.router.surveyedLocaleController.set('pageNumber', FLOW.router.surveyedLocaleController.get('pageNumber') - 1);
   },
 
-  hasNextPage: function () {
+  hasNextPage: Ember.computed(function () {
     return FLOW.metaControl.get('numSLLoaded') == 20;
-  }.property('FLOW.metaControl.numSLLoaded'),
+  }).property('FLOW.metaControl.numSLLoaded'),
 
-  hasPrevPage: function () {
+  hasPrevPage: Ember.computed(function () {
     return FLOW.router.surveyedLocaleController.get('pageNumber');
-  }.property('FLOW.router.surveyedLocaleController.pageNumber'),
+  }).property('FLOW.router.surveyedLocaleController.pageNumber'),
   
   willDestroyElement: function () {
     FLOW.router.surveyedLocaleController.set('currentContents', null);
@@ -121,9 +126,9 @@ FLOW.MonitoringDataTableView = FLOW.View.extend({
 /**
  * View of each row/data point in the monitoring data tab
  */
-FLOW.DataPointView = FLOW.View.extend({
-    templateName: 'navData/monitoring-data-row',
-
+FLOW.DataPointView = FLOW.View.extend(template('navData/monitoring-data-row'), observe({
+    'this.showDataApprovalBlock': 'loadDataPointApprovalObserver',
+}), {
     approvalStatus: [{label: Ember.String.loc('_pending'), value: 'PENDING'}, { label: Ember.String.loc('_approved'), value: 'APPROVED' },{ label: Ember.String.loc('_rejected'), value: 'REJECTED'}],
      
      //catering for counter for the data points.
@@ -132,11 +137,11 @@ FLOW.DataPointView = FLOW.View.extend({
     pageNumber: 0,
     showDataApprovalBlock: false,
 
-    showApprovalStatusColumn: function () {
+    showApprovalStatusColumn: Ember.computed(function () {
         return this.get('parentView').get('showApprovalStatusColumn');
-    }.property(),
+    }).property(),
 
-    dataPointApprovals: function () {
+    dataPointApprovals: Ember.computed(function () {
         var approvals = FLOW.router.dataPointApprovalController.get('content');
         if(!approvals) {
             return;
@@ -144,19 +149,19 @@ FLOW.DataPointView = FLOW.View.extend({
 
         var surveyedLocaleId = this.content && this.content.get('keyId');
         return approvals.filterProperty('surveyedLocaleId', surveyedLocaleId);
-    }.property('FLOW.router.dataPointApprovalController.content.@each'),
+    }).property('FLOW.router.dataPointApprovalController.content.@each'),
 
     /*
      * get the next approval step id
      */
-    nextApprovalStepId: function () {
+    nextApprovalStepId: Ember.computed(function () {
         return this.get('nextApprovalStep') && this.get('nextApprovalStep').get('keyId');
-    }.property('this.nextApprovalStep'),
+    }).property('this.nextApprovalStep'),
 
     /*
      * Derive the next approval step (in ordered approvals)
      */
-    nextApprovalStep: function () {
+    nextApprovalStep: Ember.computed(function () {
         var nextStep;
         var approvals = this.get('dataPointApprovals');
         var steps = FLOW.router.approvalStepsController.get('arrangedContent');
@@ -180,15 +185,15 @@ FLOW.DataPointView = FLOW.View.extend({
     // NOTE: below we observe the '@each.approvalDate' in order to be
     // sure that we only recalculate the next step whenever the approval
     //  has been correctly updated on the server side
-    }.property('this.dataPointApprovals.@each.approvalDate'),
+    }).property('this.dataPointApprovals.@each.approvalDate'),
 
     /*
      * return true if there are any of the approvals rejected in this set
      */
-    hasRejectedApproval: function () {
+    hasRejectedApproval: Ember.computed(function () {
         var approvals = this.get('dataPointApprovals');
         return !Ember.empty(approvals.filterProperty('status', 'REJECTED'));
-    }.property('this.dataPointApprovals'),
+    }).property('this.dataPointApprovals'),
 
     loadDataPointApprovalObserver: function () {
         if(!this.get('showDataApprovalBlock')) {
@@ -199,16 +204,16 @@ FLOW.DataPointView = FLOW.View.extend({
         if (dataPoint) {
             FLOW.router.dataPointApprovalController.loadBySurveyedLocaleId(dataPoint.get('keyId'));
         }
-    }.observes('this.showDataApprovalBlock'),
+    },
 
     toggleShowDataApprovalBlock: function () {
         this.toggleProperty('showDataApprovalBlock');
     },
 
-    dataPointRowNumber: function () {
+    dataPointRowNumber: Ember.computed(function () {
         var pageNumber = FLOW.router.surveyedLocaleController.get('pageNumber');
         return this.get('_parentView.contentIndex') + 1 + 20 * pageNumber;
-    }.property()
+    }).property()
 });
 
 /**
@@ -218,7 +223,7 @@ FLOW.DataPointView = FLOW.View.extend({
 FLOW.DataPointApprovalStatusView = FLOW.View.extend({
     content: null,
 
-    dataPointApprovalStatus: function () {
+    dataPointApprovalStatus: Ember.computed(function () {
         var approvalStepStatus;
         var latestApprovalStep = this.get('latestApprovalStep');
         if (!latestApprovalStep) {
@@ -233,12 +238,12 @@ FLOW.DataPointApprovalStatusView = FLOW.View.extend({
                                 Ember.String.loc('_pending');
 
         return latestApprovalStep.get('title') + ' - ' + approvalStepStatus.toUpperCase();
-    }.property('this.parentView.nextApprovalStep'),
+    }).property('this.parentView.nextApprovalStep'),
 
     /*
      * Derive the latest approval step for a particular data point
      */
-    latestApprovalStep: function () {
+    latestApprovalStep: Ember.computed(function () {
         var lastStep, steps;
         var nextStep = this.get('parentView').get('nextApprovalStep');
 
@@ -249,7 +254,7 @@ FLOW.DataPointApprovalStatusView = FLOW.View.extend({
             lastStep = steps && steps.get('lastObject');
             return lastStep;
         }
-    }.property('this.parentView.nextApprovalStep'),
+    }).property('this.parentView.nextApprovalStep'),
 });
 
 /**
@@ -260,7 +265,7 @@ FLOW.DataPointApprovalView = FLOW.View.extend({
 
     dataPoint: null,
 
-    dataPointApproval: function () {
+    dataPointApproval: Ember.computed(function () {
         var approvals = this.get('parentView').get('dataPointApprovals');
         var defaultApproval = Ember.Object.create({ status: null, comment: null});
 
@@ -272,30 +277,30 @@ FLOW.DataPointApprovalView = FLOW.View.extend({
         var approval = approvals.filterProperty('approvalStepId', stepId).get('firstObject');
 
         return approval || defaultApproval;
-    }.property('this.parentView.dataPointApprovals'),
+    }).property('this.parentView.dataPointApprovals'),
 
-    isApprovedStep: function () {
+    isApprovedStep: Ember.computed(function () {
         var dataPointApproval = this.get('dataPointApproval');
         return dataPointApproval && dataPointApproval.get('keyId');
-    }.property('this.dataPointApproval'),
+    }).property('this.dataPointApproval'),
 
     /*
      * return the current user's id
      */
-    currentUserId: function () {
+    currentUserId: Ember.computed(function () {
         var step = this.get('step');
         var currentUserEmail = FLOW.currentUser.get('email');
         var userList = FLOW.router.userListController.get('content');
         var currentUser = userList &&
                             userList.filterProperty('emailAddress', currentUserEmail).get('firstObject');
         return currentUser && currentUser.get('keyId');
-    }.property(),
+    }).property(),
 
     /*
      * Enable the approval fields based on whether or not approval steps
      * should be executed in order
      */
-    showApprovalFields: function () {
+    showApprovalFields: Ember.computed(function () {
         if(this.get('parentView').get('hasRejectedApproval')) {
             return false;
         }
@@ -316,7 +321,7 @@ FLOW.DataPointApprovalView = FLOW.View.extend({
             // all steps so that its possible to approve any step
             return true;
         }
-    }.property('this.parentView.nextApprovalStep'),
+    }).property('this.parentView.nextApprovalStep'),
 
     /*
      *  Submit data approval properties to controller
diff --git a/Dashboard/app/js/lib/views/data/question-answer-view.js b/Dashboard/app/js/lib/views/data/question-answer-view.js
index 05f7de9823..5c9bdba97f 100644
--- a/Dashboard/app/js/lib/views/data/question-answer-view.js
+++ b/Dashboard/app/js/lib/views/data/question-answer-view.js
@@ -1,3 +1,6 @@
+import observe from '../../mixins/observe';
+import template from '../../mixins/template';
+
 // this function is also present in assignment-edit-views.js, we need to consolidate using moment.js
 
 function formatDate(date) {
@@ -11,64 +14,66 @@ function sortByOrder(a , b) {
   return a.get('order') - b.get('order');
 }
 
-FLOW.QuestionAnswerView = Ember.View.extend({
+FLOW.QuestionAnswerView = Ember.View.extend(observe({
+  'this.numberValue': 'doValidateNumber',
+}), {
 
-  isTextType: function(){
+  isTextType: Ember.computed(function(){
     return this.get('questionType') === 'FREE_TEXT';
-  }.property('this.questionType'),
+  }).property('this.questionType'),
 
-  isCascadeType: function(){
+  isCascadeType: Ember.computed(function(){
     return this.get('questionType') === 'CASCADE';
-  }.property('this.questionType'),
+  }).property('this.questionType'),
 
-  isOptionType: function(){
+  isOptionType: Ember.computed(function(){
     return this.get('questionType') === 'OPTION';
-  }.property('this.questionType'),
+  }).property('this.questionType'),
 
-  isNumberType: function(){
+  isNumberType: Ember.computed(function(){
     return this.get('questionType') === 'NUMBER';
-  }.property('this.questionType'),
+  }).property('this.questionType'),
 
-  isBarcodeType: function(){
+  isBarcodeType: Ember.computed(function(){
     return this.get('questionType') === 'SCAN';
-  }.property('this.questionType'),
+  }).property('this.questionType'),
 
-  isDateType: function(){
+  isDateType: Ember.computed(function(){
     return this.get('questionType') === 'DATE';
-  }.property('this.questionType'),
+  }).property('this.questionType'),
 
-  isPhotoType: function(){
+  isPhotoType: Ember.computed(function(){
     return (this.get('questionType') === 'PHOTO' || (this.content && this.content.get('type') === 'IMAGE'));
-  }.property('this.questionType'),
+  }).property('this.questionType'),
 
-  isVideoType: function(){
+  isVideoType: Ember.computed(function(){
     return this.get('questionType') === 'VIDEO';
-  }.property('this.questionType'),
+  }).property('this.questionType'),
 
-  isGeoShapeType: function(){
+  isGeoShapeType: Ember.computed(function(){
     return this.get('questionType') === 'GEOSHAPE';
-  }.property('this.questionType'),
+  }).property('this.questionType'),
 
-  isSignatureType: function(){
+  isSignatureType: Ember.computed(function(){
     return this.get('questionType') === 'SIGNATURE' || (this.content && this.content.get('type') === 'SIGNATURE');
-  }.property('this.questionType'),
+  }).property('this.questionType'),
 
-  isCaddisflyType: function(){
+  isCaddisflyType: Ember.computed(function(){
     return this.get('questionType') === 'CADDISFLY' || (this.content && this.content.get('type') === 'CADDISFLY');
-  }.property('this.questionType'),
+  }).property('this.questionType'),
 
   nonEditableQuestionTypes: ['GEO', 'PHOTO', 'VIDEO', 'GEOSHAPE', 'SIGNATURE','CADDISFLY'],
 
-  form: function() {
+  form: Ember.computed(function() {
     if (FLOW.selectedControl.get('selectedSurvey')) {
       return FLOW.selectedControl.get('selectedSurvey');
     }
-  }.property('FLOW.selectedControl.selectedSurvey'),
+  }).property('FLOW.selectedControl.selectedSurvey'),
 
   /*
    * Get the full list of options related to a particular option type question
    */
-  optionsList: function(){
+  optionsList: Ember.computed(function(){
     var c = this.content;
     if (Ember.none(c) || !this.get('isOptionType')) {
       return Ember.A([]);
@@ -80,12 +85,12 @@ FLOW.QuestionAnswerView = Ember.View.extend({
       return item.get('questionId') === +questionId;
     });
 
-    optionArray = options.toArray();
+    var optionArray = options.toArray();
     optionArray.sort(function (a, b) {
         return a.get('order') - b.get('order');
     });
 
-    tempList = Ember.A([]);
+    var tempList = Ember.A([]);
     var obj;
     optionArray.forEach(function (item) {
       obj = Ember.Object.create({
@@ -103,27 +108,27 @@ FLOW.QuestionAnswerView = Ember.View.extend({
       tempList.push(Ember.Object.create({
         code: setOptionCodes ? "OTHER" : null, // OTHER is default code
         otherText: null,
-        text: function () {
+        text: Ember.computed(function () {
           var suffix = this.get('otherText') ? this.get('otherText') : Ember.String.loc('_other_option_specify');
           return Ember.String.loc('_other') + ": " + suffix;
-        }.property('this.otherText'),
+        }).property('this.otherText'),
         order: tempList.get('length'),
         isOther: true,
       }));
     }
     return tempList;
-  }.property('this.content'),
+  }).property('this.content'),
 
   content: null,
 
   inEditMode: false,
 
-  isNotEditable: function() {
+  isNotEditable: Ember.computed(function() {
     // keep this property to limit template rafactoring
     return !this.get('isEditable');
-  }.property('this.isEditable'),
+  }).property('this.isEditable'),
 
-  isEditable: function () {
+  isEditable: Ember.computed(function () {
     var isEditableQuestionType, canEditFormResponses;
     isEditableQuestionType = this.nonEditableQuestionTypes.indexOf(this.get('questionType')) < 0;
     if (!isEditableQuestionType) {
@@ -131,7 +136,7 @@ FLOW.QuestionAnswerView = Ember.View.extend({
     }
     canEditFormResponses = FLOW.permControl.canEditResponses(this.get('form'));
     return isEditableQuestionType && canEditFormResponses;
-  }.property('this.questionType,this.form'),
+  }).property('this.questionType,this.form'),
 
   date: null,
 
@@ -139,26 +144,26 @@ FLOW.QuestionAnswerView = Ember.View.extend({
    *  Extract base64 signature image data and convert to src attribute for
    *  HTML img tag
    */
-  signatureImageSrc: function () {
+  signatureImageSrc: Ember.computed(function () {
     var c = this.content, srcAttr = 'data:image/png;base64,', signatureJson;
     if (c && c.get('value')) {
       signatureJson = JSON.parse(c.get('value'));
       return srcAttr + signatureJson.image;
     }
     return null
-  }.property('this.content'),
+  }).property('this.content'),
 
   /*
    * Extract signatory from signature response
    */
-  signatureSignatory: function () {
+  signatureSignatory: Ember.computed(function () {
     var c = this.content, signatureJson;
     if (c && c.get('value')) {
       signatureJson = JSON.parse(c.get('value'));
       return signatureJson.name.trim();
     }
     return null;
-  }.property('this.content'),
+  }).property('this.content'),
 
   /*
   * Parse the caddisfly test JSON result
@@ -191,7 +196,7 @@ FLOW.QuestionAnswerView = Ember.View.extend({
    *
    * Extracts the 'name' attribute from a Caddisfly JSON result string
    */
-  testName: function(){
+  testName: Ember.computed(function(){
     var c = this.content, testJson;
     if (c && c.get('value')) {
       testJson = JSON.parse(c.get('value'));
@@ -203,7 +208,7 @@ FLOW.QuestionAnswerView = Ember.View.extend({
       }
     }
     return null;
-  }.property('this.content'),
+  }).property('this.content'),
 
   /*
    * Get out the caddisfly image URL
@@ -215,7 +220,7 @@ FLOW.QuestionAnswerView = Ember.View.extend({
    *
    * Extracts the 'image' attribute from a Caddisfly JSON result string, and returns a full URL
    */
-  caddisflyImageURL: function(){
+  caddisflyImageURL: Ember.computed(function(){
     var c = this.content, testJson;
     if (c && c.get('value')) {
       testJson = JSON.parse(c.get('value'));
@@ -224,11 +229,11 @@ FLOW.QuestionAnswerView = Ember.View.extend({
       }
     }
     return null;
-  }.property('this.content'),
+  }).property('this.content'),
 
   numberValue: null,
 
-  cascadeValue: function(key, value, previousValue){
+  cascadeValue: Ember.computed(function(key, value, previousValue){
     var c = this.content;
     // setter
     if (arguments.length > 1) {
@@ -261,7 +266,7 @@ FLOW.QuestionAnswerView = Ember.View.extend({
       return cascadeString;
     }
     return null;
-  }.property('this.content'),
+  }).property('this.content'),
 
   /* object properties to include when transforming selected options
    * to string to store in the datastore
@@ -287,7 +292,7 @@ FLOW.QuestionAnswerView = Ember.View.extend({
    *    '[{text: "text with code", code: "code"}]'
    *    '[{text: "only text"}]'
    */
-  optionValue: function (key, value, previousValue) {
+  optionValue: Ember.computed(function (key, value, previousValue) {
     var valueArray = [], selectedOptions = Ember.A(), c = this.content, isOtherEnabled;
 
     // setter
@@ -301,7 +306,7 @@ FLOW.QuestionAnswerView = Ember.View.extend({
       this.set('selectedOptionValues', this.parseOptionsValueString(c.get('value')));
     }
     return this.get('selectedOptionValues');
-  }.property('this.selectedOptionValues'),
+  }).property('this.selectedOptionValues'),
 
   /*
    *  Used to parse a provided string response from the value property of an option question.
@@ -368,7 +373,7 @@ FLOW.QuestionAnswerView = Ember.View.extend({
    *  of a single-select option question.
    *
    */
-  singleSelectOptionValue: function (key, value, previousValue) {
+  singleSelectOptionValue: Ember.computed(function (key, value, previousValue) {
     var selectedOptions, c = this.content;
 
     // setter
@@ -384,14 +389,14 @@ FLOW.QuestionAnswerView = Ember.View.extend({
       return options.get('firstObject');
     }
     return null;
-  }.property('this.optionValue'),
+  }).property('this.optionValue'),
 
   /*
    *  A property to enable setting and getting of the selected element
    *  of a multi-select option question.
    *
    */
-  multiSelectOptionValue: function (key, value, previousValue) {
+  multiSelectOptionValue: Ember.computed(function (key, value, previousValue) {
     var c = this.content;
 
     // setter
@@ -401,62 +406,62 @@ FLOW.QuestionAnswerView = Ember.View.extend({
 
     // getter
     return this.get('optionValue');
-  }.property('this.optionValue'),
+  }).property('this.optionValue'),
 
-  isMultipleSelectOption: function () {
+  isMultipleSelectOption: Ember.computed(function () {
     return this.get('isOptionType') && this.get('question').get('allowMultipleFlag');
-  }.property('this.isOptionType'),
+  }).property('this.isOptionType'),
 
-  isOtherOptionEnabled: function () {
+  isOtherOptionEnabled: Ember.computed(function () {
     return this.get('isOptionType') && this.get('question').get('allowOtherFlag');
-  }.property('this.isOptionType'),
+  }).property('this.isOptionType'),
 
-  isOtherOptionSelected: function () {
+  isOtherOptionSelected: Ember.computed(function () {
     var selectedOption = this.get('optionValue') && this.get('optionValue').get('lastObject');
     return selectedOption && selectedOption.get('isOther');
-  }.property('this.optionValue'),
+  }).property('this.optionValue'),
 
-  photoUrl: function(){
+  photoUrl: Ember.computed(function(){
     var c = this.content;
     if (!Ember.empty(c.get('value'))) {
-      jImage = JSON.parse(c.get('value'));
+      var jImage = JSON.parse(c.get('value'));
       if (jImage && jImage.filename) {
           return FLOW.Env.photo_url_root + jImage.filename.split('/').pop();
       }
     }
-  }.property('this.content,this.isPhotoType,this.isVideoType'),
+  }).property('this.content,this.isPhotoType,this.isVideoType'),
 
-  photoLocation: function(){
+  photoLocation: Ember.computed(function(){
     var c = this.content;
     if (!Ember.empty(c.get('value'))) {
-      jImage = JSON.parse(c.get('value'));
+      var jImage = JSON.parse(c.get('value'));
       if (jImage && jImage.location) {
           return "lat:" + jImage.location.latitude + "/lon:" + jImage.location.longitude;
       }
     }
-  }.property('this.content,this.isPhotoType,this.isVideoType'),
+  }).property('this.content,this.isPhotoType,this.isVideoType'),
 
-  geoShapeObject: function(){
+  geoShapeObject: Ember.computed(function(){
     var c = this.content;
     if (!Ember.empty(c.get('value'))) {
       return c.get('value');
     }
-  }.property('this.content,this.isGeoShapeType'),
+  }).property('this.content,this.isGeoShapeType'),
 
-  questionType: function(){
+  questionType: Ember.computed(function(){
     if(this.get('question')){
       return this.get('question').get('type');
     }
-  }.property('this.question'),
+  }).property('this.question'),
 
-  question: function(){
+  question: Ember.computed(function(){
     var c = this.get('content');
     if (c) {
       var questionId = c.get('questionID');
       var q = FLOW.questionControl.findProperty('keyId', +questionId);
       return q;
     }
-  }.property('this.content'),
+  }).property('this.content'),
 
   doEdit: function () {
     this.set('inEditMode', true);
@@ -520,7 +525,7 @@ FLOW.QuestionAnswerView = Ember.View.extend({
   doValidateNumber: function () {
     // TODO should check for minus sign and decimal point, depending on question setting
     this.set('numberValue', this.get('numberValue').toString().replace(/[^\d.]/g, ""));
-  }.observes('this.numberValue'),
+  },
 
   popupMedia: function () {
     if (this.get('photoUrl')) {
@@ -558,7 +563,7 @@ FLOW.QuestionAnswerMultiOptionEditView = Ember.CollectionView.extend({
   selection: null,
   itemViewClass: Ember.View.extend({
     template: Ember.Handlebars.compile('{{view Ember.Checkbox checkedBinding="view.isSelected"}} {{view.content.text}}'),
-    isSelected: function(key, checked, previousValue) {
+    isSelected: Ember.computed(function(key, checked, previousValue) {
       var selectedOptions = this.get('parentView').get('selection');
       var newSelectedOptions = Ember.A();
 
@@ -580,17 +585,13 @@ FLOW.QuestionAnswerMultiOptionEditView = Ember.CollectionView.extend({
 
       // getter
       return selectedOptions && selectedOptions.contains(this.content);
-    }.property('this.content'),
+    }).property('this.content'),
   })
 });
 
-FLOW.QuestionAnswerInspectDataView = FLOW.QuestionAnswerView.extend({
-  templateName: 'navData/question-answer',
-});
+FLOW.QuestionAnswerInspectDataView = FLOW.QuestionAnswerView.extend(template('navData/question-answer'));
 
-FLOW.QuestionAnswerMonitorDataView = FLOW.QuestionAnswerView.extend({
-  templateName: 'navData/question-answer',
-  
+FLOW.QuestionAnswerMonitorDataView = FLOW.QuestionAnswerView.extend(template('navData/question-answer'), {
   doEdit : function (){ //override the doEdit action in the parentView
     this._super();
     this.set('inEditMode', false)
diff --git a/Dashboard/app/js/lib/views/devices/assignment-edit-views.js b/Dashboard/app/js/lib/views/devices/assignment-edit-views.js
index 68cc92ed12..285702e82c 100644
--- a/Dashboard/app/js/lib/views/devices/assignment-edit-views.js
+++ b/Dashboard/app/js/lib/views/devices/assignment-edit-views.js
@@ -1,3 +1,5 @@
+import observe from '../../mixins/observe';
+
 // removes duplicate objects with a clientId from an Ember Array
 
 FLOW.ArrNoDupe = function (a) {
@@ -26,7 +28,10 @@ FLOW.formatDate = function (value) {
   } else return null;
 };
 
-FLOW.AssignmentEditView = FLOW.View.extend({
+FLOW.AssignmentEditView = FLOW.View.extend(observe({
+  'FLOW.router.navigationController.selected': 'detectChangeTab',
+  'FLOW.router.devicesSubnavController.selected': 'detectChangeTab',
+}), {
   devicesPreview: Ember.A([]),
   surveysPreview: Ember.A([]),
   assignmentName: null,
@@ -79,7 +84,7 @@ FLOW.AssignmentEditView = FLOW.View.extend({
       FLOW.selectedControl.get('selectedSurveyAssignment').deleteRecord();
     }
     FLOW.selectedControl.set('selectedSurveyAssignment', null);
-  }.observes('FLOW.router.navigationController.selected', 'FLOW.router.devicesSubnavController.selected'),
+  },
 
   assignmentNotComplete: function () {
 	  if (Ember.empty(this.get('assignmentName'))) {
diff --git a/Dashboard/app/js/lib/views/devices/assignments-list-view.jsx b/Dashboard/app/js/lib/views/devices/assignments-list-view.jsx
new file mode 100644
index 0000000000..b3239fce35
--- /dev/null
+++ b/Dashboard/app/js/lib/views/devices/assignments-list-view.jsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import moment from 'moment';
+require('akvo-flow/views/react-component');
+
+FLOW.AssignmentsListView = FLOW.ReactComponentView.extend({
+  didInsertElement(...args) {
+    this._super(...args);
+    this.reactRender(
+      <div style={{ visibility: 'hidden' }}>React {moment().seconds()}</div>
+    );
+  }
+});
diff --git a/Dashboard/app/js/lib/views/devices/devices-views.js b/Dashboard/app/js/lib/views/devices/devices-views.js
index 2631864290..f925a51f65 100644
--- a/Dashboard/app/js/lib/views/devices/devices-views.js
+++ b/Dashboard/app/js/lib/views/devices/devices-views.js
@@ -1,4 +1,8 @@
-FLOW.CurrentDevicesTabView = Ember.View.extend({
+import observe from '../../mixins/observe';
+
+FLOW.CurrentDevicesTabView = Ember.View.extend(observe({
+  'this.selectedDeviceGroup': 'copyDeviceGroupName',
+}), {
   // FLOW.CurrentDevicesTabView = FLOW.View.extend({
   showDeleteDevicesDialogBool: false,
   showAddToGroupDialogBool: false,
@@ -81,7 +85,7 @@ FLOW.CurrentDevicesTabView = Ember.View.extend({
     if (this.get('selectedDeviceGroup') !== null) {
       this.set('changedDeviceGroupName', this.selectedDeviceGroup.get('code'));
     }
-  }.observes('this.selectedDeviceGroup'),
+  },
 
   // TODO update device group name in tabel.
   doManageDeviceGroups: function () {
@@ -143,7 +147,9 @@ FLOW.CurrentDevicesTabView = Ember.View.extend({
 
 
 // TODO not used?
-FLOW.SavingDeviceGroupView = FLOW.View.extend({
+FLOW.SavingDeviceGroupView = FLOW.View.extend(observe({
+  'FLOW.deviceGroupControl.allRecordsSaved': 'showDGSavingDialog',
+}), {
   showDGSavingDialogBool: false,
 
   showDGSavingDialog: function () {
@@ -152,5 +158,5 @@ FLOW.SavingDeviceGroupView = FLOW.View.extend({
     } else {
       this.set('showDGSavingDialogBool', true);
     }
-  }.observes('FLOW.deviceGroupControl.allRecordsSaved')
+  },
 });
diff --git a/Dashboard/app/js/lib/views/maps/map-views-common-public.js b/Dashboard/app/js/lib/views/maps/map-views-common-public.js
index 277201ddb2..8905f3d6ea 100644
--- a/Dashboard/app/js/lib/views/maps/map-views-common-public.js
+++ b/Dashboard/app/js/lib/views/maps/map-views-common-public.js
@@ -1,5 +1,10 @@
-FLOW.NavMapsView = FLOW.View.extend({
-  templateName: 'navMaps/nav-maps-common',
+import observe from '../../mixins/observe';
+import template from '../../mixins/template';
+const { create_geomodel } = require('../../../plugins/geocells');
+
+FLOW.NavMapsView = FLOW.View.extend(template('navMaps/nav-maps-common'), observe({
+  'FLOW.placemarkDetailController.content.isLoaded': 'handlePlacemarkDetails',
+}), {
   showDetailsBool: false,
   detailsPaneElements: null,
   detailsPaneVisible: null,
@@ -180,7 +185,7 @@ FLOW.NavMapsView = FLOW.View.extend({
     if (!Ember.empty(details) && details.get('isLoaded')) {
       this.populateDetailsPane(details);
     }
-  }.observes('FLOW.placemarkDetailController.content.isLoaded'),
+  },
 
 
   /**
diff --git a/Dashboard/app/js/lib/views/maps/map-views-common.js b/Dashboard/app/js/lib/views/maps/map-views-common.js
index b8d7f622fe..ad0fb58f8e 100644
--- a/Dashboard/app/js/lib/views/maps/map-views-common.js
+++ b/Dashboard/app/js/lib/views/maps/map-views-common.js
@@ -1,5 +1,13 @@
-FLOW.NavMapsView = FLOW.View.extend({
-  templateName: 'navMaps/nav-maps-common',
+import observe from '../../mixins/observe';
+import template from '../../mixins/template';
+const { create_geomodel } = require('../../../plugins/geocells');
+
+FLOW.NavMapsView = FLOW.View.extend(template('navMaps/nav-maps-common'), observe({
+  'FLOW.router.mapsController.selectedMarker': 'handlePlacemarkDetails',
+  'FLOW.selectedControl.selectedSurvey': 'surveySelection',
+  'FLOW.selectedControl.selectedSurveyGroup': 'surveyGroupSelection',
+  'this.detailsPaneVisible': 'detailsPaneShowHide',
+}), {
   showDetailsBool: false,
   detailsPaneElements: null,
   detailsPaneVisible: null,
@@ -169,7 +177,7 @@ FLOW.NavMapsView = FLOW.View.extend({
   */
   handlePlacemarkDetails: function () {
     this.showDetailsPane();
-  }.observes('FLOW.router.mapsController.selectedMarker'),
+  },
 
   //function to project geoshape from details panel to main map canvas
   projectGeoshape: function(geoShapeObject){
@@ -208,12 +216,12 @@ FLOW.NavMapsView = FLOW.View.extend({
 
   surveySelection: function () {
       this.clearMap("form-selection");
-  }.observes('FLOW.selectedControl.selectedSurvey'),
+  },
 
   surveyGroupSelection: function () {
       this.clearMap("survey-selection");
       this.redoMap();
-  }.observes('FLOW.selectedControl.selectedSurveyGroup'),
+  },
 
   clearMap: function (trigger) {
     FLOW.router.mapsController.clearMarker();
@@ -252,10 +260,9 @@ FLOW.NavMapsView = FLOW.View.extend({
     },
 
   detailsPaneShowHide: function(){
-      var button = this.$('#mapDetailsHideShow');
       var display = this.detailsPaneVisible;
 
-      button.html('&lsaquo; ' + Ember.String.loc((display) ? '_hide' : '_show'));
+      this.$('#mapDetailsHideShow').html('&lsaquo; ' + Ember.String.loc((display) ? '_hide' : '_show'));
 
       this.$('#flowMap').animate({
         width: (display) ? '75%' : '99.25%'
@@ -270,7 +277,7 @@ FLOW.NavMapsView = FLOW.View.extend({
         opacity: (display) ? '1' : '0',
         display: (display) ? 'inherit' : 'none'
       });
-  }.observes('this.detailsPaneVisible'),
+  },
 
   showDetailsPane: function(){
       if (!this.detailsPaneVisible) {
@@ -284,8 +291,7 @@ FLOW.PlacemarkDetailsView = FLOW.View.extend({});
 
 FLOW.PlacemarkDetailPhotoView = Ember.View.extend({});
 
-FLOW.GeoshapeMapView = FLOW.View.extend({
-  templateName: 'navMaps/geoshape-map',
+FLOW.GeoshapeMapView = FLOW.View.extend(template('navMaps/geoshape-map'), {
   geoshape: null,
 
   didInsertElement: function() {
@@ -299,19 +305,19 @@ FLOW.GeoshapeMapView = FLOW.View.extend({
     }
   },
 
-  length: function() {
+  length: Ember.computed(function() {
     return this.geoshape === null ? null : this.geoshape.features[0].properties.length
-  }.property('this.geoshape'),
+  }).property('this.geoshape'),
 
-  area: function() {
+  area: Ember.computed(function() {
     return this.geoshape === null ? null : this.geoshape.features[0].properties.area
-  }.property('this.geoshape'),
+  }).property('this.geoshape'),
 
-  pointCount: function() {
+  pointCount: Ember.computed(function() {
     return this.geoshape === null ? null : this.geoshape.features[0].properties.pointCount
-  }.property('this.geoshape'),
+  }).property('this.geoshape'),
 
-  isPolygon: function() {
+  isPolygon: Ember.computed(function() {
     var geoshape = this.get('geoshape');
     if (geoshape == null) {
       return false;
@@ -319,9 +325,9 @@ FLOW.GeoshapeMapView = FLOW.View.extend({
       return geoshape['features'].length > 0 &&
         geoshape['features'][0]["geometry"]["type"] === "Polygon"
     }
-  }.property('this.geoshape'),
+  }).property('this.geoshape'),
 
-  isLineString: function() {
+  isLineString: Ember.computed(function() {
     var geoshape = this.get('geoshape');
     if (geoshape == null) {
       return false;
@@ -329,9 +335,9 @@ FLOW.GeoshapeMapView = FLOW.View.extend({
       return geoshape['features'].length > 0 &&
         geoshape['features'][0]["geometry"]["type"] === "LineString"
     }
-  }.property('this.geoshape'),
+  }).property('this.geoshape'),
 
-  isMultiPoint: function() {
+  isMultiPoint: Ember.computed(function() {
     var geoshape = this.get('geoshape');
     if (geoshape == null) {
       return false;
@@ -339,9 +345,9 @@ FLOW.GeoshapeMapView = FLOW.View.extend({
       return geoshape['features'].length > 0 &&
         geoshape['features'][0]["geometry"]["type"] === "MultiPoint"
     }
-  }.property('this.geoshape'),
+  }).property('this.geoshape'),
 
-  geoshapeString: function() {
+  geoshapeString: Ember.computed(function() {
     return this.geoshape === null ? null : JSON.stringify(this.geoshape);
-  }.property('this.geoshape')
+  }).property('this.geoshape')
 });
diff --git a/Dashboard/app/js/lib/views/messages/message-view.js b/Dashboard/app/js/lib/views/messages/message-view.js
index 9c7558dd9c..8897bb5ca8 100644
--- a/Dashboard/app/js/lib/views/messages/message-view.js
+++ b/Dashboard/app/js/lib/views/messages/message-view.js
@@ -18,21 +18,21 @@ FLOW.MessagesListView = FLOW.View.extend({
 
   // If the number of items in the previous call was 20 (a full page) we assume that there are more.
   // This is not foolproof, but will only lead to an empty next page in 1/20 of the cases
-  hasNextPage: function () {
+  hasNextPage: Ember.computed(function () {
     if (FLOW.metaControl.get('num') == 20) {
       return true;
     } else {
       return false;
     }
-  }.property('FLOW.metaControl.num'),
+  }).property('FLOW.metaControl.num'),
 
   // not perfect yet, sometimes previous link is shown while there are no previous pages.
-  hasPrevPage: function () {
+  hasPrevPage: Ember.computed(function () {
     if (FLOW.messageControl.get('sinceArray').length === 1) {
       return false;
     } else {
       return true;
     }
-  }.property('FLOW.messageControl.sinceArray.length')
+  }).property('FLOW.messageControl.sinceArray.length')
 
 });
diff --git a/Dashboard/app/js/lib/views/react-component.js b/Dashboard/app/js/lib/views/react-component.js
new file mode 100644
index 0000000000..ee4d54b4dc
--- /dev/null
+++ b/Dashboard/app/js/lib/views/react-component.js
@@ -0,0 +1,19 @@
+import ReactDOM from 'react-dom';
+
+FLOW.ReactComponentView = Ember.View.extend({
+  template: Ember.Handlebars.compile(''),
+
+  reactRender(reactComponent) {
+    ReactDOM.render(reactComponent, this.get('element'));
+  },
+
+  unmountReactElement() {
+    ReactDOM.unmountComponentAtNode(this.get('element'));
+  },
+
+  willDestroyElement() {
+    this._super();
+    this.unmountReactElement();
+  }
+});
+  
\ No newline at end of file
diff --git a/Dashboard/app/js/lib/views/reports/export-reports-views.js b/Dashboard/app/js/lib/views/reports/export-reports-views.js
index 7da3832447..2b8bd8d4d3 100644
--- a/Dashboard/app/js/lib/views/reports/export-reports-views.js
+++ b/Dashboard/app/js/lib/views/reports/export-reports-views.js
@@ -1,13 +1,16 @@
+import observe from '../../mixins/observe';
+import template from '../../mixins/template';
+
 /*global Ember, $, FLOW */
 
 FLOW.ReportLoader = Ember.Object.create({
-  selectedSurveyId: function () {
+  selectedSurveyId: Ember.computed(function () {
     if (!Ember.none(FLOW.selectedControl.get('selectedSurvey')) && !Ember.none(FLOW.selectedControl.selectedSurvey.get('keyId'))){
       return FLOW.selectedControl.selectedSurvey.get('keyId');
     } else {
       return null;
     }
-  }.property('FLOW.selectedControl.selectedSurvey'),
+  }).property('FLOW.selectedControl.selectedSurvey'),
 
   load: function (exportType, surveyId, opts) {
     FLOW.selectedControl.set('selectedReportExport', FLOW.store.createRecord(FLOW.Report, {}));
@@ -41,17 +44,20 @@ FLOW.ReportLoader = Ember.Object.create({
   }
 });
 
-FLOW.ExportReportsView = Ember.View.extend({
-  templateName: 'navReports/export-reports',
+FLOW.ExportReportsView = Ember.View.extend(template('navReports/export-reports'), {
   missingSurvey: false,
-  
   updateSurveyStatus: function (surveyStatus) {
      this.set('missingSurvey', surveyStatus !== 'survey-selected')
      Ember.$('body, html ,#navExportSelect').scrollTop(0);
   }
 });
 
-FLOW.ExportReportTypeView = Ember.View.extend({
+FLOW.ExportReportTypeView = Ember.View.extend(observe({
+  'this.exportOption': 'dateRangeDisabledObserver',
+  'this.reportFromDate': 'setMinDate',
+  'this.reportToDate': 'setMaxDate',
+  'FLOW.selectedControl.selectedSurvey': 'watchSurveySelection',
+}), {
   showRawDataReportApplet: false,
   showComprehensiveReportApplet: false,
   showGoogleEarthFileApplet: false,
@@ -75,19 +81,19 @@ FLOW.ExportReportTypeView = Ember.View.extend({
     this.set('rangeActive', this.get("exportOption") === "range" ? "" : "background-color: transparent;");
     this.set('recentActive', this.get("exportOption") === "recent" ? "" : "background-color: transparent;");
     this.set('dateRangeDisabled', this.get("exportOption") === "recent");
-  }.observes('this.exportOption'),
+  },
 
   setMinDate: function () {
     if (this.get('reportFromDate')) {
       this.$(".to_date").datepicker("option", "minDate", this.get("reportFromDate"))
     }
-  }.observes('this.reportFromDate'),
+  },
 
   setMaxDate: function () {
     if (this.get('reportToDate')) {
      this.$(".from_date").datepicker("option", "maxDate", this.get("reportToDate"))
     }
-  }.observes('this.reportToDate'),
+  },
 
   didInsertElement: function () {
     FLOW.selectedControl.set('surveySelection', FLOW.SurveySelection.create());
@@ -96,22 +102,22 @@ FLOW.ExportReportTypeView = Ember.View.extend({
     FLOW.uploader.registerEvents();
   },
 
-  selectedQuestion: function () {
+  selectedQuestion: Ember.computed(function () {
     if (!Ember.none(FLOW.selectedControl.get('selectedQuestion'))
         && !Ember.none(FLOW.selectedControl.selectedQuestion.get('keyId'))){
       return FLOW.selectedControl.selectedQuestion.get('keyId');
     } else {
       return null;
     }
-  }.property('FLOW.selectedControl.selectedQuestion'),
+  }).property('FLOW.selectedControl.selectedQuestion'),
   
   watchSurveySelection: function () {
      if (FLOW.selectedControl.get('selectedSurvey')!== null) {
         this.get('parentView').updateSurveyStatus('survey-selected')
      }
-  }.observes('FLOW.selectedControl.selectedSurvey'),
+  },
 
-  hideLastCollection: function () {
+  hideLastCollection: Ember.computed(function () {
     if (!FLOW.selectedControl.selectedSurvey) {
       return true;
     }
@@ -128,7 +134,7 @@ FLOW.ExportReportTypeView = Ember.View.extend({
     }
     return !(FLOW.selectedControl.selectedSurveyGroup && FLOW.selectedControl.selectedSurveyGroup.get('monitoringGroup')
       && FLOW.selectedControl.selectedSurvey.get('keyId') != FLOW.selectedControl.selectedSurveyGroup.get('newLocaleSurveyId'));
-  }.property('FLOW.selectedControl.selectedSurvey'),
+  }).property('FLOW.selectedControl.selectedSurvey'),
 
   showDataCleaningReport: function () {
     var opts = {startDate:this.get("reportFromDate"), endDate:this.get("reportToDate"), lastCollectionOnly: this.get('exportOption') === "recent"};
@@ -229,9 +235,7 @@ FLOW.ExportReportTypeView = Ember.View.extend({
   })
 });
 
-FLOW.ReportsListView = Ember.View.extend({
-  templateName: 'navReports/reports-list',
-
+FLOW.ReportsListView = Ember.View.extend(template('navReports/reports-list'), {
   didInsertElement: function () {
     FLOW.router.reportsController.populate();
   },
@@ -241,10 +245,8 @@ FLOW.ReportsListView = Ember.View.extend({
   }
 });
 
-FLOW.ReportListItemView = FLOW.View.extend({
-  templateName: 'navReports/report',
-
-  reportType: function(){
+FLOW.ReportListItemView = FLOW.View.extend(template('navReports/report'), {
+  reportType: Ember.computed(function (){
     var reportTypeClasses = {
       DATA_CLEANING: "dataCleanExp",
       DATA_ANALYSIS: "dataAnalyseExp",
@@ -253,9 +255,9 @@ FLOW.ReportListItemView = FLOW.View.extend({
       SURVEY_FORM: "surveyFormExp"
     };
     return reportTypeClasses[this.content.get('reportType')];
-  }.property(this.content),
+  }).property('content'),
 
-  reportStatus: function(){
+  reportStatus: Ember.computed(function(){
     var reportStates = {
       IN_PROGRESS: "exportGenerating",
       QUEUED: "exportGenerating",
@@ -263,9 +265,9 @@ FLOW.ReportListItemView = FLOW.View.extend({
       FINISHED_ERROR: ""
     };
     return reportStates[this.content.get('state')];
-  }.property(this.content),
+  }).property('content'),
 
-  reportTypeString: function(){
+  reportTypeString: Ember.computed(function(){
     var reportTypeStrings = {
       DATA_CLEANING: Ember.String.loc('_data_cleaning_export'),
       DATA_ANALYSIS: Ember.String.loc('_data_analysis_export'),
@@ -274,19 +276,19 @@ FLOW.ReportListItemView = FLOW.View.extend({
       SURVEY_FORM: Ember.String.loc('_survey_form')
     };
     return reportTypeStrings[this.content.get('reportType')];
-  }.property(this.content),
+  }).property('content'),
 
-  reportFilename: function(){
+  reportFilename: Ember.computed(function(){
     var url = this.content.get('filename');
     return FLOW.reportFilename(url);
-  }.property(this.content),
+  }).property('content'),
 
-  reportLink: function(){
+  reportLink: Ember.computed(function(){
     var url = this.content.get('filename');
     return !url ? "#" : url;
-  }.property(this.content),
+  }).property('content'),
 
-  surveyPath: function(){
+  surveyPath: Ember.computed(function(){
     var formId = this.content.get('formId'), path = "";
     var form  = FLOW.Survey.find(formId);
     if (form) {
@@ -308,23 +310,24 @@ FLOW.ReportListItemView = FLOW.View.extend({
       }
     }
     return path;
-  }.property(this.content),
+  }).property('content'),
 
-  startDate: function(){
+  startDate: Ember.computed(function(){
     return FLOW.renderTimeStamp(this.content.get('startDate'));
-  }.property(this.content),
+  }).property('content'),
 
-  endDate: function(){
+  endDate: Ember.computed(function(){
     return FLOW.renderTimeStamp(this.content.get('endDate'));
-  }.property(this.content),
+  }).property('content'),
 
-  lastUpdateDateTime: function(){
+  lastUpdateDateTime: Ember.computed(function(){
     return FLOW.renderDate(this.content.get('lastUpdateDateTime'));
-  }.property(this.content)
+  }).property('content')
 });
 
-FLOW.DataCleaningView = Ember.View.extend({
-  templateName: 'navData/data-cleaning',
+FLOW.DataCleaningView = Ember.View.extend(template('navData/data-cleaning'), observe({
+  'FLOW.selectedControl.selectedSurvey': 'watchSurveySelection',
+}), {
   missingSurvey:false,
 
   didInsertElement: function () {
@@ -354,5 +357,5 @@ FLOW.DataCleaningView = Ember.View.extend({
       if (FLOW.selectedControl.get('selectedSurvey')!== null) {
          this.set('missingSurvey', false)
       }
-   }.observes('FLOW.selectedControl.selectedSurvey')
+   }
 });
diff --git a/Dashboard/app/js/lib/views/reports/report-views.js b/Dashboard/app/js/lib/views/reports/report-views.js
index 35d1cabe98..22294c2d88 100644
--- a/Dashboard/app/js/lib/views/reports/report-views.js
+++ b/Dashboard/app/js/lib/views/reports/report-views.js
@@ -1,7 +1,10 @@
 /*global deleteChart, createDoughnutChart, createHBarChart, createVBarChart*/
+import observe from '../../mixins/observe';
 
-
-FLOW.chartView = FLOW.View.extend({
+FLOW.chartView = FLOW.View.extend(observe({
+  'this.selectedSurvey': 'downloadOptionQuestions',
+  'FLOW.surveyQuestionSummaryControl.content.isLoaded': 'buildChart',
+}), {
   noChoiceBool: false,
   noDataBool: false,
   chartType: null,
@@ -12,20 +15,20 @@ FLOW.chartView = FLOW.View.extend({
 	  if (!Ember.none(this.get('selectedSurvey'))) {
 		  FLOW.questionControl.downloadOptionQuestions(this.selectedSurvey.get('keyId'));
 	  }
-  }.observes('this.selectedSurvey'),
+  },
 
-  isDoughnut: function () {
+  isDoughnut: Ember.computed(function () {
     return this.chartType.get('value') == 'doughnut';
-  }.property('this.chartType'),
+  }).property('this.chartType'),
 
   init: function () {
     this._super();
     this.chartType = FLOW.chartTypeControl.content[0];
   },
 
-  hideChart: function () {
+  hideChart: Ember.computed(function () {
 	  return this.get('noChoiceBool') || this.get('noDataBool');
-  }.property('noChoiceBool', 'noDataBool'),
+  }).property('noChoiceBool', 'noDataBool'),
 
   getChartData: function () {
     this.set('noChoiceBool', false);
@@ -152,5 +155,5 @@ FLOW.chartView = FLOW.View.extend({
         createHBarChart();
       }
     }
-  }.observes('FLOW.surveyQuestionSummaryControl.content.isLoaded')
+  },
 });
diff --git a/Dashboard/app/js/lib/views/surveys/form-view.js b/Dashboard/app/js/lib/views/surveys/form-view.js
index 23506769de..6cae093b0f 100644
--- a/Dashboard/app/js/lib/views/surveys/form-view.js
+++ b/Dashboard/app/js/lib/views/surveys/form-view.js
@@ -1,26 +1,27 @@
-FLOW.FormView = Ember.View.extend({
-	templateName: 'navSurveys/form',
+import template from '../../mixins/template';
+
+FLOW.FormView = Ember.View.extend(template('navSurveys/form'), {
 	showFormBasics: false,
 
 	manageTranslations: false,
 	manageNotifications: false,
 
-	form: function() {
+	form: Ember.computed(function() {
 		return FLOW.selectedControl.get('selectedSurvey');
-	}.property('FLOW.selectedControl.selectedSurvey'),
+	}).property('FLOW.selectedControl.selectedSurvey'),
 
 	toggleShowFormBasics: function () {
 		this.set('showFormBasics', !this.get('showFormBasics'));
 	},
 
-	isNewForm: function() {
+	isNewForm: Ember.computed(function() {
 		var form = FLOW.selectedControl.get('selectedSurvey');
 		return form && form.get('code') == "New Form";
-	}.property('FLOW.selectedControl.selectedSurvey'),
+	}).property('FLOW.selectedControl.selectedSurvey'),
 
-	visibleFormBasics: function() {
+	visibleFormBasics: Ember.computed(function() {
 		return this.get('isNewForm') || this.get('showFormBasics');
-	}.property('showFormBasics'),
+	}).property('showFormBasics'),
 
 
 	doManageTranslations: function() {
@@ -35,23 +36,23 @@ FLOW.FormView = Ember.View.extend({
 		this.set('manageNotifications', true);
 	},
 
-	disableFormFields: function () {
+	disableFormFields: Ember.computed(function () {
 		var form = this.get('form');
 		return !FLOW.permControl.canEditForm(form);
-	}.property('this.form'),
+	}).property('this.form'),
 
-	showFormTranslationsButton: function() {
+	showFormTranslationsButton: Ember.computed(function() {
 		var form = this.get('form');
 		return FLOW.permControl.canEditForm(form);
-	}.property('this.form'),
+	}).property('this.form'),
 
-	showFormDeleteButton: function () {
+	showFormDeleteButton: Ember.computed(function () {
 		var form = this.get('form');
 		return FLOW.permControl.canEditForm(form);
-	}.property('this.form'),
+	}).property('this.form'),
 
-	showFormPublishButton: function () {
+	showFormPublishButton: Ember.computed(function () {
 		var form = this.get('form');
 		return FLOW.permControl.canEditForm(form);
-	}.property('this.form')
+	}).property('this.form')
 });
diff --git a/Dashboard/app/js/lib/views/surveys/notifications-view.js b/Dashboard/app/js/lib/views/surveys/notifications-view.js
index 799af1ac8c..14798cb501 100644
--- a/Dashboard/app/js/lib/views/surveys/notifications-view.js
+++ b/Dashboard/app/js/lib/views/surveys/notifications-view.js
@@ -1,5 +1,6 @@
-FLOW.NotificationsView = FLOW.View.extend({
-  templateName: 'navSurveys/manage-notifications',
+import template from '../../mixins/template';
+
+FLOW.NotificationsView = FLOW.View.extend(template('navSurveys/manage-notifications'), {
   notificationOption: null,
   notificationType: null,
   expiryDate: null,
diff --git a/Dashboard/app/js/lib/views/surveys/preview-view.js b/Dashboard/app/js/lib/views/surveys/preview-view.js
index 548e5c9591..95aea6c2a4 100644
--- a/Dashboard/app/js/lib/views/surveys/preview-view.js
+++ b/Dashboard/app/js/lib/views/surveys/preview-view.js
@@ -1,5 +1,7 @@
-FLOW.PreviewView = FLOW.View.extend({
-  templateName: 'navSurveys/preview-view',
+import observe from '../../mixins/observe';
+import template from '../../mixins/template';
+
+FLOW.PreviewView = FLOW.View.extend(template('navSurveys/preview-view'), {
   closePreviewPopup: function () {
     FLOW.previewControl.set('showPreviewPopup', false);
   }
@@ -17,7 +19,7 @@ FLOW.PreviewQuestionGroupView = FLOW.View.extend({
       return item.get('questionGroupId') == qgId;
     });
 
-    tmp = QGcontent.toArray();
+    var tmp = QGcontent.toArray();
     tmp.sort(function(a,b){
     	return a.get('order') - b.get('order');
     });
@@ -25,7 +27,11 @@ FLOW.PreviewQuestionGroupView = FLOW.View.extend({
   }
 });
 
-FLOW.PreviewQuestionView = FLOW.View.extend({
+FLOW.PreviewQuestionView = FLOW.View.extend(observe({
+  'FLOW.previewControl.changed': 'checkVisibility',
+  'this.optionChoice': 'storeOptionChoice',
+  'this.answer': 'storeAnswer',
+}), {
   isTextType: false,
   isOptionType: false,
   isNumberType: false,
@@ -45,7 +51,7 @@ FLOW.PreviewQuestionView = FLOW.View.extend({
   longitude: null,
 
   init: function () {
-    var opList, opListArray, i, sizeList, qId, tempList, cascadeNames;
+    var opList, opListArray, i, sizeList, qId, tempList, cascadeNames, optionArray, options;
     this._super();
 
     this.set('isTextType', this.content.get('type') == 'FREE_TEXT');
@@ -88,7 +94,7 @@ FLOW.PreviewQuestionView = FLOW.View.extend({
       this.set('optionsList', tempList);
     }
     if (this.isCascadeType) {
-    	cascade = FLOW.store.find(FLOW.CascadeResource,this.content.get('cascadeResourceId'));
+    	var cascade = FLOW.store.find(FLOW.CascadeResource,this.content.get('cascadeResourceId'));
     	if (!Ember.empty(cascade)){
     		cascadeNames = cascade.get('levelNames');
     		for (i=0 ; i < cascade.get('numLevels'); i++){
@@ -108,18 +114,18 @@ FLOW.PreviewQuestionView = FLOW.View.extend({
         this.set('isVisible', false);
       }
     }
-  }.observes('FLOW.previewControl.changed'),
+  },
 
   storeOptionChoice: function () {
     var keyId;
     keyId = this.content.get('keyId');
     FLOW.previewControl.answers[keyId] = this.get('optionChoice');
     FLOW.previewControl.toggleProperty('changed');
-  }.observes('this.optionChoice'),
+  },
 
   storeAnswer: function () {
     var keyId;
     keyId = this.content.get('keyId');
     FLOW.previewControl.answers[keyId] = this.get('answer');
-  }.observes('this.answer')
+  },
 });
diff --git a/Dashboard/app/js/lib/views/surveys/question-view.js b/Dashboard/app/js/lib/views/surveys/question-view.js
index 99370fc67c..611f4ee544 100644
--- a/Dashboard/app/js/lib/views/surveys/question-view.js
+++ b/Dashboard/app/js/lib/views/surveys/question-view.js
@@ -1,9 +1,18 @@
+import observe from '../../mixins/observe';
+import template from '../../mixins/template';
+
 function sortByOrder(a , b) {
   return a.get('order') - b.get('order');
 }
 
-FLOW.QuestionView = FLOW.View.extend({
-  templateName: 'navSurveys/question-view',
+FLOW.QuestionView = FLOW.View.extend(template('navSurveys/question-view'), observe({
+  'FLOW.selectedControl.dependentQuestion': 'fillOptionList',
+  'this.text': 'validateQuestionObserver',
+  'FLOW.questionOptionsControl.emptyOptions': 'validateQuestionObserver',
+  'this.tip': 'validateQuestionTooltipObserver',
+  'this.variableName': 'validateVariableNameObserver',
+  'this.selectedCaddisflyTestBrand': 'brandsObserver',
+}), {
   content: null,
   variableName: null,
   text: null,
@@ -31,15 +40,15 @@ FLOW.QuestionView = FLOW.View.extend({
   questionTooltipValidationFailure: false,
   caddisflyResourceUuid: null,
 
-  showCaddisflyTests: function () {
+  showCaddisflyTests: Ember.computed(function () {
       return FLOW.router.caddisflyResourceController.get("testsFileLoaded");
-  }.property('FLOW.router.caddisflyResourceController.testsFileLoaded'),
+  }).property('FLOW.router.caddisflyResourceController.testsFileLoaded'),
 
-  showMetaConfig: function () {
+  showMetaConfig: Ember.computed(function () {
     return FLOW.Env.showMonitoringFeature;
-  }.property('FLOW.Env.showMonitoringFeature'),
+  }).property('FLOW.Env.showMonitoringFeature'),
 
-  amOpenQuestion: function () {
+  amOpenQuestion: Ember.computed(function () {
     var selected = FLOW.selectedControl.get('selectedQuestion');
     if (selected && this.get('content')) {
       var isOpen = (this.content.get('keyId') == FLOW.selectedControl.selectedQuestion.get('keyId'));
@@ -47,103 +56,95 @@ FLOW.QuestionView = FLOW.View.extend({
     } else {
       return false;
     }
-  }.property('FLOW.selectedControl.selectedQuestion', 'content.keyId').cacheable(),
+  }).property('FLOW.selectedControl.selectedQuestion', 'content.keyId').cacheable(),
 
-  amTextType: function () {
+  amTextType: Ember.computed(function () {
     if (this.type) {
       return this.type.get('value') == 'FREE_TEXT';
     } else {
       return false;
     }
-  }.property('this.type').cacheable(),
+  }).property('this.type').cacheable(),
 
-  amOptionType: function () {
+  amOptionType: Ember.computed(function () {
     return this.type && this.type.get('value') === 'OPTION';
-  }.property('this.type'),
+  }).property('this.type'),
 
-  amNumberType: function () {
+  amNumberType: Ember.computed(function () {
     if (this.type) {
       return this.type.get('value') == 'NUMBER';
     } else {
       return false;
     }
-  }.property('this.type').cacheable(),
+  }).property('this.type').cacheable(),
 
-  amBarcodeType: function () {
+  amBarcodeType: Ember.computed(function () {
       if (this.type) {
           return this.type.get('value') === 'SCAN';
       } else {
           return false;
       }
-  }.property('this.type').cacheable(),
+  }).property('this.type').cacheable(),
 
-  amFreeTextType: function () {
+  amFreeTextType: Ember.computed(function () {
     if (this.type) {
       return this.type.get('value') == 'FREE_TEXT';
     } else {
       return false;
     }
-  }.property('this.type').cacheable(),
+  }).property('this.type').cacheable(),
 
-  amGeoType: function () {
+  amGeoType: Ember.computed(function () {
     if (this.type) {
       return this.type.get('value') == 'GEO';
     } else {
       return false;
     }
-  }.property('this.type').cacheable(),
-
-  amNumberType: function () {
-    if (this.type) {
-      return this.type.get('value') == 'NUMBER';
-    } else {
-      return false;
-    }
-  }.property('this.type').cacheable(),
+  }).property('this.type').cacheable(),
 
-  amCascadeType: function () {
+  amCascadeType: Ember.computed(function () {
     if (this.type) {
       return this.type.get('value') == 'CASCADE';
     } else {
       return false;
     }
-  }.property('this.type').cacheable(),
+  }).property('this.type').cacheable(),
 
-  hasExtraSettings: function () {
+  hasExtraSettings: Ember.computed(function () {
     var val;
     if (!Ember.none(this.type)) {
       val = this.type.get('value');
       return val === 'GEOSHAPE' || val === 'CASCADE' || val === 'NUMBER' || val === 'GEO' 
       || val === 'FREE_TEXT' || val === 'SCAN' || val === 'OPTION' || val === 'CADDISFLY';
     }
-  }.property('this.type').cacheable(),
+  }).property('this.type').cacheable(),
 
-  amGeoshapeType: function () {
+  amGeoshapeType: Ember.computed(function () {
     if (this.type) {
       return this.type.get('value') == 'GEOSHAPE';
     } else {
       return false;
     }
-  }.property('this.type').cacheable(),
+  }).property('this.type').cacheable(),
 
-  amDateType: function () {
+  amDateType: Ember.computed(function () {
     if (this.type) {
       return this.type.get('value') == 'DATE';
     } else {
       return false;
     }
-  }.property('this.type').cacheable(),
+  }).property('this.type').cacheable(),
 
-  amSignatureType: function () {
+  amSignatureType: Ember.computed(function () {
     return (this.content && this.content.get('type') === 'SIGNATURE')
             || (this.type && this.type.get('value') === 'SIGNATURE');
-  }.property('this.type'),
+  }).property('this.type'),
   
-   amCaddisflyType: function(){
+   amCaddisflyType: Ember.computed(function(){
        return this.type && this.type.get('value') == 'CADDISFLY';
-   }.property('this.type').cacheable(),
+   }).property('this.type').cacheable(),
   
-  showLocaleName: function () {
+  showLocaleName: Ember.computed(function () {
     if (!this.type) {
       return false;
     }
@@ -152,7 +153,7 @@ FLOW.QuestionView = FLOW.View.extend({
         || this.type.get('value') == 'OPTION'
         || this.type.get('value') == 'SCAN'
         || this.type.get('value') == 'CASCADE';
-  }.property('this.type').cacheable(),
+  }).property('this.type').cacheable(),
 
   // TODO dependencies
   // TODO options
@@ -205,6 +206,11 @@ FLOW.QuestionView = FLOW.View.extend({
     if (!Ember.empty(FLOW.selectedControl.selectedQuestion.get('caddisflyResourceUuid'))) {
       var caddResource = FLOW.router.caddisflyResourceController.content.findProperty('uuid', FLOW.selectedControl.selectedQuestion.get('caddisflyResourceUuid'));
       if (!Ember.empty(caddResource)) {
+        this.set('selectedCaddisflyTestSample', this.get('caddisflyTestSamples').findProperty('sample', caddResource.get('sample')));
+        this.set('selectedCaddisflyTestName', this.get('caddisflyTestNames').findProperty('name', caddResource.get('name')));
+        this.set('selectedCaddisflyTestBrand', this.get('caddisflyTestBrands').find(function (item) {
+          return item.brand === caddResource.get('brand') && item.model === caddResource.get('model') && item.device === caddResource.get('device')
+        }));
         FLOW.selectedControl.set('selectedCaddisflyResource',caddResource);
       }
     }
@@ -241,11 +247,11 @@ FLOW.QuestionView = FLOW.View.extend({
    *  Load the question options for question editing
    */
   loadQuestionOptions: function () {
-    var c = this.content;
+    var c = this.content, optionArray;
     FLOW.questionOptionsControl.set('content', []);
     FLOW.questionOptionsControl.set('questionId', c.get('keyId'));
 
-    options = FLOW.store.filter(FLOW.QuestionOption, function (optionItem) {
+    const options = FLOW.store.filter(FLOW.QuestionOption, function (optionItem) {
         return optionItem.get('questionId') === c.get('keyId');
     });
 
@@ -258,14 +264,15 @@ FLOW.QuestionView = FLOW.View.extend({
   },
 
   fillOptionList: function () {
-    var optionList, optionListArray, i, sizeList;
-    if (FLOW.selectedControl.get('dependentQuestion') !== null) {
+    var optionList, optionArray, i, sizeList, options;
+    if (FLOW.selectedControl.get('dependentQuestion')) {
+      var dependentQuestion = FLOW.selectedControl.get('dependentQuestion');
       FLOW.optionListControl.set('content', []);
       FLOW.optionListControl.set('currentActive', null);
 
       options = FLOW.store.filter(FLOW.QuestionOption, function (item) {
         if (!Ember.none(FLOW.selectedControl.selectedQuestion)) {
-          return item.get('questionId') == FLOW.selectedControl.dependentQuestion.get('keyId');
+          return item.get('questionId') == dependentQuestion.get('keyId');
         } else {
           return false;
         }
@@ -283,7 +290,7 @@ FLOW.QuestionView = FLOW.View.extend({
         }));
       });
     }
-  }.observes('FLOW.selectedControl.dependentQuestion'),
+  },
 
   doCancelEditQuestion: function () {
     FLOW.selectedControl.set('selectedQuestion', null);
@@ -568,7 +575,7 @@ FLOW.QuestionView = FLOW.View.extend({
 
   // move question to selected location
   doQuestionMoveHere: function () {
-    var selectedOrder, insertAfterOrder, selectedQ, useMoveQuestion, qgIdSource, qgIdDest;
+    var selectedOrder, insertAfterOrder, selectedQ, useMoveQuestion, qgIdSource, qgIdDest, qgId, questionsInGroup;
     selectedOrder = FLOW.selectedControl.selectedForMoveQuestion.get('order');
 
     if (this.get('zeroItemQuestion')) {
@@ -613,11 +620,11 @@ FLOW.QuestionView = FLOW.View.extend({
           return item.get('questionGroupId') == qgId;
         });
 
-        origOrder = FLOW.selectedControl.selectedForMoveQuestion.get('order');
-        movingUp = origOrder < insertAfterOrder;
+        var origOrder = FLOW.selectedControl.selectedForMoveQuestion.get('order');
+        var movingUp = origOrder < insertAfterOrder;
 
         questionsInGroup.forEach(function (item) {
-          currentOrder = item.get('order');
+          var currentOrder = item.get('order');
           if (movingUp) {
             if (currentOrder == origOrder) {
               // move moving item to right location
@@ -726,24 +733,24 @@ FLOW.QuestionView = FLOW.View.extend({
   },
 
   // true if one question has been selected for Move
-  oneSelectedForMove: function () {
+  oneSelectedForMove: Ember.computed(function () {
     var selectedForMove = FLOW.selectedControl.get('selectedForMoveQuestion');
     if (selectedForMove) {
       return true;
     } else {
       return false;
     }
-  }.property('FLOW.selectedControl.selectedForMoveQuestion'),
+  }).property('FLOW.selectedControl.selectedForMoveQuestion'),
 
   // true if one question has been selected for Copy
-  oneSelectedForCopy: function () {
+  oneSelectedForCopy: Ember.computed(function () {
     var selectedForCopy = FLOW.selectedControl.get('selectedForCopyQuestion');
     if (selectedForCopy) {
       return true;
     } else {
       return false;
     }
-  }.property('FLOW.selectedControl.selectedForCopyQuestion'),
+  }).property('FLOW.selectedControl.selectedForCopyQuestion'),
 
   // prepare for question copy. Shows 'copy to here' buttons
   doQuestionCopy: function () {
@@ -776,11 +783,11 @@ FLOW.QuestionView = FLOW.View.extend({
           this.set('questionValidationFailureReason', Ember.String.loc('_question_text_empty'));
         }
       }
-  }.observes('this.text', 'FLOW.questionOptionsControl.emptyOptions'),
+  },
 
   validateQuestionTooltipObserver: function(){
       this.set('questionTooltipValidationFailure', (this.tip != null && this.tip.length > 500));
-  }.observes('this.tip'),
+  },
 
   validateVariableNameObserver: function() {
     var self = this;
@@ -794,12 +801,125 @@ FLOW.QuestionView = FLOW.View.extend({
         self.set('variableNameValidationFailureReason', msg);
       }
     });
-  }.observes('this.variableName'),
+  },
 
-  showQuestionModifyButtons: function () {
+  showQuestionModifyButtons: Ember.computed(function () {
     var form = FLOW.selectedControl.get('selectedSurvey');
     return FLOW.permControl.canEditForm(form);
-  }.property('FLOW.selectedControl.selectedSurvey'),
+  }).property('FLOW.selectedControl.selectedSurvey'),
+
+  caddisflyTestSamples: Ember.computed(function () {
+    var tests = FLOW.router.caddisflyResourceController.get('content'), distinct = {}, testSamples = [];
+    FLOW.selectedControl.set('selectedCaddisflyResource', null);
+    this.set('selectedCaddisflyTestSample', null);
+    tests.forEach(function (obj) {
+      if (!(obj.sample in distinct)) {
+        testSamples.push(obj);
+      }
+      distinct[obj.sample] = 0;
+    });
+    return this.sortedList(testSamples, 'sample');
+  }).property('FLOW.router.caddisflyResourceController.content'),
+
+  caddisflyTestNames: Ember.computed(function () {
+    var tests = FLOW.router.caddisflyResourceController.get('content'), distinct = {}, testNames = [];
+    FLOW.selectedControl.set('selectedCaddisflyResource', null);
+    this.set('selectedCaddisflyTestName', null);
+    if (this.get('selectedCaddisflyTestSample')) {
+      var sample = this.get('selectedCaddisflyTestSample');
+      var names = tests.filter(function (item) {
+        return item['sample'] === sample['sample'];
+      });
+      names.forEach(function (obj) {
+        if (!(obj.name in distinct)) {
+          testNames.push(obj);
+        }
+        distinct[obj.name] = 0;
+      });
+    }
+    return this.sortedList(testNames, 'name');
+  }).property('this.selectedCaddisflyTestSample'),
+
+  caddisflyTestBrands: Ember.computed(function () {
+    var tests = FLOW.router.caddisflyResourceController.get('content'), distinct = {}, testBrands = [];
+    FLOW.selectedControl.set('selectedCaddisflyResource', null);
+    this.set('selectedCaddisflyTestBrand', null);
+    if (this.get('selectedCaddisflyTestName')) {
+      var name = this.get('selectedCaddisflyTestName');
+      var brands = tests.filter(function (item) {
+        return item['sample'] == name['sample'] && item['name'] === name['name'];
+      });
+      brands.forEach(function (obj) {
+        var displayName = "brand" in obj && obj.brand ? obj.brand : "";
+        displayName += "model" in obj && obj.model ? " - " + obj.model : "";
+        displayName += "device" in obj && obj.device ? " - " + obj.device : "";
+
+        if (!(displayName in distinct)) {
+          obj['brandDisplayName'] = displayName;
+          testBrands.push(obj);
+        }
+        distinct[displayName] = 0;
+      });
+    } else {
+      this.set('selectedCaddisflyTestBrand', null);
+    }
+    return this.sortedList(testBrands, 'brandDisplayName');
+  }).property('this.selectedCaddisflyTestName'),
+
+  caddisflyTestDetails: Ember.computed(function () {
+    var tests = FLOW.router.caddisflyResourceController.get('content'), distinct = {}, testDetails = [];
+    if (this.get('selectedCaddisflyTestBrand')) {
+      var brands = this.get('selectedCaddisflyTestBrand');
+      var details = tests.filter(function (item) {
+        return item['sample'] == brands['sample'] && item['name'] === brands['name'] &&
+          item['brand'] === brands['brand'] && item['model'] === brands['model'] &&
+            item['device'] === brands['device'];
+      });
+      details.forEach(function (obj) {
+        var results = obj.results, displayName = "";
+        for (var i = 0; i < results.length; i++) {
+          displayName += "name" in results[i] ? results[i].name : "";
+          displayName += "chemical" in results[i] ? " (" + results[i].chemical + ")" : "";
+          displayName += "range" in results[i] ? " " + results[i].range : "";
+          displayName += "unit" in results[i] ? " " + results[i].unit : "";
+          displayName += (i+1) < results.length ? ", " : "";
+        }
+
+        var reagents = obj.reagents;
+        for (var i = 0; i < reagents.length; i++) {
+          displayName += " " + reagents[i]['code'];
+        }
+
+        if (!(displayName in distinct)) {
+          obj['detailsDisplayName'] = displayName;
+          testDetails.push(obj);
+        }
+        distinct[displayName] = 0;
+      });
+    }
+    return this.sortedList(testDetails, 'detailsDisplayName');
+  }).property('this.selectedCaddisflyTestBrand'),
+
+  sortedList: function (arr, prop) {
+    return arr.sort(function (a, b) {
+      var nameA = a[prop].toUpperCase(); // ignore upper and lowercase
+      var nameB = b[prop].toUpperCase(); // ignore upper and lowercase
+      if (nameA < nameB) {
+        return -1;
+      }
+      if (nameA > nameB) {
+        return 1;
+      }
+
+      // names must be equal
+      return 0;
+    });
+  },
+
+  brandsObserver: function () {
+    //needed to disable save button when no resource brand is specified
+    FLOW.selectedControl.set('selectedCaddisflyResource', null);
+  },
 });
 
 /*
@@ -808,7 +928,18 @@ FLOW.QuestionView = FLOW.View.extend({
 FLOW.OptionListView = Ember.CollectionView.extend({
   tagName: 'ul',
   content: null,
-  itemViewClass: Ember.View.extend({
-    templateName: 'navSurveys/question-option',
-  }),
+  itemViewClass: Ember.View.extend(template('navSurveys/question-option'), {
+    topOption: Ember.computed(function () {
+      var option = this.get('content');
+      if (option) {
+        return option.get('order') == 1;
+      }
+    }).property('content.order'),
+    bottomOption: Ember.computed(function () {
+      var option = this.get('content'), options = FLOW.questionOptionsControl.get('content');
+      if (option && options) {
+        return option.get('order') == options.get('length');
+      }
+    }).property('content.order', 'FLOW.questionOptionsControl.content.length')
+  })
 });
diff --git a/Dashboard/app/js/lib/views/surveys/survey-details-views.js b/Dashboard/app/js/lib/views/surveys/survey-details-views.js
index ecaba7b314..154118b8d9 100644
--- a/Dashboard/app/js/lib/views/surveys/survey-details-views.js
+++ b/Dashboard/app/js/lib/views/surveys/survey-details-views.js
@@ -1,3 +1,5 @@
+import observe from '../../mixins/observe';
+
 // ************************ Surveys *************************
 // FLOW.SurveySidebarView = FLOW.View.extend({
 FLOW.SurveySidebarView = FLOW.View.extend({
@@ -28,9 +30,9 @@ FLOW.SurveySidebarView = FLOW.View.extend({
     this.set('language', language);
   },
 
-  isExistingSurvey: function () {
+  isExistingSurvey: Ember.computed(function () {
     return !Ember.none(FLOW.selectedControl.selectedSurvey.get('keyId'));
-  }.property('FLOW.selectedControl.selectedSurvey.keyId'),
+  }).property('FLOW.selectedControl.selectedSurvey.keyId'),
 
   setIsDirty: function () {
     var isDirty, survey;
@@ -62,23 +64,23 @@ FLOW.SurveySidebarView = FLOW.View.extend({
     this.set('isDirty', isDirty);
   },
 
-  isPublished: function () {
+  isPublished: Ember.computed(function () {
     return FLOW.selectedControl.selectedSurvey.get('status') == 'PUBLISHED';
-  }.property('FLOW.selectedControl.selectedSurvey.status'),
+  }).property('FLOW.selectedControl.selectedSurvey.status'),
 
-  numberQuestions: function () {
+  numberQuestions: Ember.computed(function () {
     if (Ember.none(FLOW.questionControl.get('filterContent'))) {
       return 0;
     }
     return FLOW.questionControl.filterContent.toArray().length;
-  }.property('FLOW.questionControl.filterContent.@each'),
+  }).property('FLOW.questionControl.filterContent.@each'),
 
-  numberQuestionGroups: function () {
+  numberQuestionGroups: Ember.computed(function () {
     if (Ember.none(FLOW.questionGroupControl.get('content'))) {
       return 0;
     }
     return FLOW.questionGroupControl.content.toArray().length;
-  }.property('FLOW.questionGroupControl.content.@each'),
+  }).property('FLOW.questionGroupControl.content.@each'),
 
   surveyNotComplete: function () {
 	 if (Ember.empty(this.get('surveyTitle'))) {
@@ -123,7 +125,7 @@ FLOW.SurveySidebarView = FLOW.View.extend({
 		return;
 	}
 	// check if we have any unsaved changes
-	survey = FLOW.store.find(FLOW.Survey, FLOW.selectedControl.selectedSurvey.get('keyId'));
+	var survey = FLOW.store.find(FLOW.Survey, FLOW.selectedControl.selectedSurvey.get('keyId'));
 	this.setIsDirty();
 	if (!Ember.none(survey) && this.get('isDirty')) {
 	    FLOW.dialogControl.set('activeAction', "ignore");
@@ -141,7 +143,7 @@ FLOW.SurveySidebarView = FLOW.View.extend({
 		return;
 	}
 	// check if we have any unsaved changes
-	survey = FLOW.store.find(FLOW.Survey, FLOW.selectedControl.selectedSurvey.get('keyId'));
+	var survey = FLOW.store.find(FLOW.Survey, FLOW.selectedControl.selectedSurvey.get('keyId'));
 	this.setIsDirty();
 	if (!Ember.none(survey) && this.get('isDirty')) {
 		 FLOW.dialogControl.set('activeAction', "ignore");
@@ -234,7 +236,7 @@ FLOW.SurveySidebarView = FLOW.View.extend({
 FLOW.QuestionGroupItemTranslationView = FLOW.View.extend({
 	content: null,
 	 // question group content comes through binding in handlebars file
-	amVisible: function () {
+	amVisible: Ember.computed(function () {
 	  var selected, isVis;
 	  selected = FLOW.selectedControl.get('selectedQuestionGroup');
 	  if (selected) {
@@ -243,7 +245,7 @@ FLOW.QuestionGroupItemTranslationView = FLOW.View.extend({
 	   } else {
 	     return null;
 	   }
-	 }.property('FLOW.selectedControl.selectedQuestionGroup', 'content.keyId').cacheable(),
+	 }).property('FLOW.selectedControl.selectedQuestionGroup', 'content.keyId').cacheable(),
 
 	toggleVisibility: function () {
 	   if (this.get('amVisible')) {
@@ -263,7 +265,9 @@ FLOW.QuestionGroupItemTranslationView = FLOW.View.extend({
 });
 
 
-FLOW.QuestionGroupItemView = FLOW.View.extend({
+FLOW.QuestionGroupItemView = FLOW.View.extend(observe({
+  'this.amCopying': 'pollQuestionGroupStatus',
+}), {
   // question group content comes through binding in handlebars file
   zeroItem: false,
   renderView: false,
@@ -272,11 +276,11 @@ FLOW.QuestionGroupItemView = FLOW.View.extend({
   pollingTimer: null,
   showSaveCancelButton: false,
 
-  amCopying: function(){
+  amCopying: Ember.computed(function(){
       return this.content.get('status') == "COPYING";
-  }.property('this.content.status'),
+  }).property('this.content.status'),
 
-  amVisible: function () {
+  amVisible: Ember.computed(function () {
     var selected, isVis;
     selected = FLOW.selectedControl.get('selectedQuestionGroup');
     if (selected) {
@@ -286,7 +290,7 @@ FLOW.QuestionGroupItemView = FLOW.View.extend({
     } else {
       return null;
     }
-  }.property('FLOW.selectedControl.selectedQuestionGroup', 'content.keyId').cacheable(),
+  }).property('FLOW.selectedControl.selectedQuestionGroup', 'content.keyId').cacheable(),
 
   toggleVisibility: function () {
     if (this.get('amVisible')) {
@@ -336,7 +340,7 @@ FLOW.QuestionGroupItemView = FLOW.View.extend({
   },
 
   // true if one question group has been selected for Move
-  oneSelectedForMove: function () {
+  oneSelectedForMove: Ember.computed(function () {
     var selectedForMove, selectedSurvey;
     selectedForMove = FLOW.selectedControl.get('selectedForMoveQuestionGroup');
     selectedSurvey = FLOW.selectedControl.get('selectedSurvey');
@@ -344,10 +348,10 @@ FLOW.QuestionGroupItemView = FLOW.View.extend({
     if (selectedForMove && selectedSurvey) {
       return selectedForMove.get('surveyId') === selectedSurvey.get('keyId');
     }
-  }.property('FLOW.selectedControl.selectedForMoveQuestionGroup'),
+  }).property('FLOW.selectedControl.selectedForMoveQuestionGroup'),
 
   // true if one question group has been selected for Copy
-  oneSelectedForCopy: function () {
+  oneSelectedForCopy: Ember.computed(function () {
     var selectedForCopy, selectedSurvey;
     selectedForCopy = FLOW.selectedControl.get('selectedForCopyQuestionGroup');
     selectedSurvey = FLOW.selectedControl.get('selectedSurvey');
@@ -355,7 +359,7 @@ FLOW.QuestionGroupItemView = FLOW.View.extend({
     if (selectedForCopy && selectedSurvey) {
       return selectedForCopy.get('surveyId') === selectedSurvey.get('keyId');
     }
-  }.property('FLOW.selectedControl.selectedForCopyQuestionGroup'),
+  }).property('FLOW.selectedControl.selectedForCopyQuestionGroup'),
 
   // execute group delete
   deleteQuestionGroup: function () {
@@ -462,7 +466,7 @@ FLOW.QuestionGroupItemView = FLOW.View.extend({
         movingUp = origOrder < insertAfterOrder;
 
         questionGroupsInSurvey.forEach(function (item) {
-          currentOrder = item.get('order');
+          var currentOrder = item.get('order');
           if (movingUp) {
             if (currentOrder == origOrder) {
               // move moving item to right location
@@ -493,53 +497,30 @@ FLOW.QuestionGroupItemView = FLOW.View.extend({
     FLOW.selectedControl.set('selectedForMoveQuestionGroup', null);
   },
 
-  /*
-   *  Request question group and check whether copying is completed on the server side
-   *  then load questions for that group.
-   */
-  ajaxCall: function(qgId){
-      var self = this;
-      $.ajax({
-          url: '/rest/question_groups/' + qgId,
-          type: 'GET',
-          success: function(data) {
-            if (data.question_group.status == "READY") {
-                // reload this question group the Ember way, so the UI is updated
-                FLOW.questionGroupControl.getQuestionGroup(self.content.get('keyId'));
-                // load the questions inside this question group
-                FLOW.questionControl.populateQuestionGroupQuestions(self.content.get('keyId'));
-            }
-          },
-          error: function() {
-            console.error("Error in checking ready status survey group copy");
-          }
-      });
-  },
-
-  qgCheckScheduled: false,
-
   // cycle until our local question group has an id
   // when this is done, start monitoring the status of the remote question group
   pollQuestionGroupStatus: function(){
       var self = this, qgQuery = null;
       if (this.get('amCopying')) {
-        if (!this.get('qgCheckScheduled')) {
-          this.set('qgCheckScheduled', true);
           qgQuery = setInterval(function () {
               // if the question group has a keyId, we can start polling it remotely
               if (self.content && self.content.get('keyId')) {
+                // we have an id and can start polling remotely
                 if (self.content.get('status') == "READY") {
-                  self.set('qgCheckScheduled', false);
+                  //load new group's questions and clear interval
+                  FLOW.store.findQuery(FLOW.Question, {
+                    questionGroupId: self.content.get('keyId')
+                  });
                   clearInterval(qgQuery);
                 } else {
-                  // we have an id and can start polling remotely
-                  self.ajaxCall(self.content.get('keyId'));
+                  FLOW.questionGroupControl.populate();
                 }
               }
-          },5000);
-        }
+          }, 5000);
+      } else {
+        clearInterval(qgQuery);
       }
-  }.observes('this.amCopying'),
+  },
 
   // execute group copy to selected location
   doQGroupCopyHere: function () {
@@ -575,13 +556,13 @@ FLOW.QuestionGroupItemView = FLOW.View.extend({
     FLOW.selectedControl.set('selectedForCopyQuestionGroup', null);
   },
 
-  showQuestionGroupModifyButtons: function() {
+  showQuestionGroupModifyButtons: Ember.computed(function() {
     var form = FLOW.selectedControl.get('selectedSurvey');
     return FLOW.permControl.canEditForm(form);
-  }.property('FLOW.selectedControl.selectedSurvey'),
+  }).property('FLOW.selectedControl.selectedSurvey'),
 
-  disableQuestionGroupEditing: function() {
+  disableQuestionGroupEditing: Ember.computed(function() {
     var form = FLOW.selectedControl.get('selectedSurvey');
     return !FLOW.permControl.canEditForm(form);
-  }.property('FLOW.selectedControl.selectedSurvey'),
+  }).property('FLOW.selectedControl.selectedSurvey'),
 });
diff --git a/Dashboard/app/js/lib/views/surveys/survey-group-views.js b/Dashboard/app/js/lib/views/surveys/survey-group-views.js
index f13bf03fed..76a2acf826 100644
--- a/Dashboard/app/js/lib/views/surveys/survey-group-views.js
+++ b/Dashboard/app/js/lib/views/surveys/survey-group-views.js
@@ -1,3 +1,6 @@
+import observe from '../../mixins/observe';
+import template from '../../mixins/template';
+
 function capitaliseFirstLetter(string) {
   return string.charAt(0).toUpperCase() + string.slice(1);
 }
@@ -8,15 +11,14 @@ if (!String.prototype.trim) {
   };
 }
 
-FLOW.ProjectListView = FLOW.View.extend({
-  templateName: 'navSurveys/project-list'
-});
+FLOW.ProjectListView = FLOW.View.extend(template('navSurveys/project-list'));
 
-FLOW.ProjectView = FLOW.View.extend({
-  templateName: 'navSurveys/project',
-});
+FLOW.ProjectView = FLOW.View.extend(template('navSurveys/project'));
 
-FLOW.Project = FLOW.View.extend({
+FLOW.Project = FLOW.View.extend(observe({
+  'this.selectedLanguage': 'updateSelectedLanguage',
+  currentRegistrationForm: 'updateSelectedRegistrationForm',
+}), {
 
   showProjectDetails: false,
   showAdvancedSettings: false,
@@ -27,7 +29,7 @@ FLOW.Project = FLOW.View.extend({
 
   /* computer property for setting / getting the value of the current
   registration form */
-  selectedRegistrationForm: function(key, value, previousValue){
+  selectedRegistrationForm: Ember.computed(function(key, value, previousValue){
     var registrationForm, formId;
 
     if(arguments.length > 1) {
@@ -43,22 +45,22 @@ FLOW.Project = FLOW.View.extend({
         this.set('currentRegistrationForm', registrationForm);
     }
     return registrationForm;
-  }.property('FLOW.projectControl.currentProject'),
+  }).property('FLOW.projectControl.currentProject'),
 
   /*
    * property for setting the currently selected approval group
    */
-  selectedApprovalGroup: function () {
+  selectedApprovalGroup: Ember.computed(function () {
       var approvalGroupId = FLOW.projectControl.currentProject.get('dataApprovalGroupId');
       var approvalGroupList = FLOW.router.approvalGroupListController.get('content');
       var approvalGroup = approvalGroupList &&
                               approvalGroupList.filterProperty('keyId', approvalGroupId).get('firstObject');
       return approvalGroup;
-  }.property('FLOW.projectControl.currentProject'),
+  }).property('FLOW.projectControl.currentProject'),
 
-  project: function() {
+  project: Ember.computed(function() {
     return FLOW.projectControl.get('currentProject');
-  }.property(),
+  }).property(),
 
   toggleShowProjectDetails: function() {
     this.set('showProjectDetails', !this.get('showProjectDetails'));
@@ -85,31 +87,31 @@ FLOW.Project = FLOW.View.extend({
       }
   },
 
-  isNewProject: function() {
+  isNewProject: Ember.computed(function() {
     var currentProject = FLOW.projectControl.get('currentProject');
     return currentProject && currentProject.get('code') == "New survey";
-  }.property('FLOW.projectControl.currentProject'),
+  }).property('FLOW.projectControl.currentProject'),
 
-  visibleProjectBasics: function() {
+  visibleProjectBasics: Ember.computed(function() {
     return this.get('isNewProject') || this.get('showProjectDetails');
-  }.property('showProjectDetails'),
+  }).property('showProjectDetails'),
 
   updateSelectedLanguage: function() {
     var currentProject = FLOW.projectControl.get('currentProject');
     if (currentProject)
       currentProject.set('defaultLanguageCode', this.selectedLanguage.get('value'));
-  }.observes('this.selectedLanguage'),
+  },
 
-  showMonitoringGroupCheckbox: function() {
+  showMonitoringGroupCheckbox: Ember.computed(function() {
     return FLOW.projectControl.get('formCount') < 2;
-  }.property("FLOW.projectControl.formCount"),
+  }).property("FLOW.projectControl.formCount"),
 
   updateSelectedRegistrationForm: function() {
     if (!this.get('currentRegistrationForm')) return;
     FLOW.projectControl.currentProject.set('newLocaleSurveyId', this.currentRegistrationForm.get('keyId'));
-  }.observes('currentRegistrationForm'),
+  },
 
-  isPublished: function() {
+  isPublished: Ember.computed(function() {
     var form;
     if (!Ember.none(FLOW.selectedControl.get('selectedSurvey'))) {
       form = FLOW.selectedControl.get('selectedSurvey');
@@ -119,26 +121,26 @@ FLOW.Project = FLOW.View.extend({
         FLOW.selectedControl.set('selectedSurvey', form);
       }
     }
-    return form.get('status') === 'PUBLISHED'
-  }.property('FLOW.selectedControl.selectedSurvey.status'),
+    return form && form.get('status') === 'PUBLISHED'
+  }).property('FLOW.selectedControl.selectedSurvey.status'),
 
-  disableFolderSurveyInputField: function() {
+  disableFolderSurveyInputField: Ember.computed(function() {
     var permissions = FLOW.projectControl.get('currentFolderPermissions');
     return permissions.indexOf("PROJECT_FOLDER_UPDATE") < 0;
-  }.property('FLOW.projectControl.currentProjectPath'),
+  }).property('FLOW.projectControl.currentProjectPath'),
 
-  showAddNewFormButton: function () {
+  showAddNewFormButton: Ember.computed(function () {
     var survey = FLOW.projectControl.get('currentProject');
     return FLOW.permControl.canEditSurvey(survey);
-  }.property(),
+  }).property(),
 
-  showDataApproval: function () {
+  showDataApproval: Ember.computed(function () {
       return FLOW.Env.enableDataApproval;
-  }.property(),
+  }).property(),
 
-  showDataApprovalList: function () {
+  showDataApprovalList: Ember.computed(function () {
       return FLOW.projectControl.currentProject.get('requireDataApproval');
-  }.property('FLOW.projectControl.currentProject.requireDataApproval'),
+  }).property('FLOW.projectControl.currentProject.requireDataApproval'),
 
   toggleShowDataApprovalDetails: function () {
       this.set('showDataApprovalDetails', !this.get('showDataApprovalDetails'));
@@ -174,7 +176,7 @@ FLOW.ApprovalResponsibleUserView = FLOW.View.extend({
 
     step: null,
 
-    isResponsibleUser: function (key, isCheckedValue, previousCheckedValue) {
+    isResponsibleUser: Ember.computed(function (key, isCheckedValue, previousCheckedValue) {
         var step = this.get('step');
         var user = this.get('user');
 
@@ -201,11 +203,11 @@ FLOW.ApprovalResponsibleUserView = FLOW.View.extend({
 
         // getter
         return approverUserList.contains(user.get('keyId'));
-    }.property('this.step.approverUserList'),
+    }).property('this.step.approverUserList'),
 });
 
 FLOW.ProjectMainView = FLOW.View.extend({
-  hasUnsavedChanges: function() {
+  hasUnsavedChanges: Ember.computed(function() {
     var selectedProject = FLOW.projectControl.get('currentProject');
     var isProjectDirty = selectedProject ? selectedProject.get('isDirty') : false;
 
@@ -225,40 +227,40 @@ FLOW.ProjectMainView = FLOW.View.extend({
 
     return isProjectDirty || isFormDirty || isApprovalStepDirty;
 
-  }.property('FLOW.projectControl.currentProject.isDirty',
+  }).property('FLOW.projectControl.currentProject.isDirty',
               'FLOW.selectedControl.selectedSurvey.isDirty',
               'FLOW.router.approvalStepsController.content.@each.approverUserList'),
 
-  projectView: function() {
+  projectView: Ember.computed(function() {
     return FLOW.projectControl.isProject(FLOW.projectControl.get('currentProject'));
-  }.property('FLOW.projectControl.currentProject'),
+  }).property('FLOW.projectControl.currentProject'),
 
-  projectListView: function() {
+  projectListView: Ember.computed(function() {
     return FLOW.projectControl.isProjectFolder(FLOW.projectControl.get('currentProject'));
-  }.property('FLOW.projectControl.currentProject'),
+  }).property('FLOW.projectControl.currentProject'),
 
-  disableAddFolderButton: function() {
+  disableAddFolderButton: Ember.computed(function() {
     var permissions = FLOW.projectControl.get('currentFolderPermissions');
     return permissions.indexOf("PROJECT_FOLDER_CREATE") < 0;
-  }.property('FLOW.projectControl.currentProjectPath'),
+  }).property('FLOW.projectControl.currentProjectPath'),
 
-  disableAddSurveyButtonInRoot: function() {
+  disableAddSurveyButtonInRoot: Ember.computed(function() {
     return FLOW.projectControl.get('currentProjectPath').length == 0;
-  }.property('FLOW.projectControl.currentProjectPath'),
+  }).property('FLOW.projectControl.currentProjectPath'),
 
-  disableAddSurveyButton: function() {
+  disableAddSurveyButton: Ember.computed(function() {
     var permissions = FLOW.projectControl.get('currentFolderPermissions');
     return permissions.indexOf("PROJECT_FOLDER_CREATE") < 0;
-  }.property('FLOW.projectControl.currentProjectPath'),
+  }).property('FLOW.projectControl.currentProjectPath'),
 });
 
 
 FLOW.ProjectList = FLOW.View.extend({
   tagName: 'ul',
   classNameBindings: ['classProperty'],
-  classProperty: function() {
+  classProperty: Ember.computed(function() {
     return FLOW.projectControl.moveTarget || FLOW.projectControl.copyTarget ? 'actionProcess' : '';
-  }.property('FLOW.projectControl.moveTarget', 'FLOW.projectControl.copyTarget')
+  }).property('FLOW.projectControl.moveTarget', 'FLOW.projectControl.copyTarget')
 });
 
 FLOW.ProjectItemView = FLOW.View.extend({
@@ -267,7 +269,7 @@ FLOW.ProjectItemView = FLOW.View.extend({
   classNameBindings: ['classProperty'],
   folderEdit: false,
 
-  classProperty: function() {
+  classProperty: Ember.computed(function() {
     var isFolder = FLOW.projectControl.isProjectFolder(this.content);
     var isFolderEmpty = FLOW.projectControl.isProjectFolderEmpty(this.content);
     var isMoving = this.content === FLOW.projectControl.get('moveTarget');
@@ -280,15 +282,15 @@ FLOW.ProjectItemView = FLOW.View.extend({
     if (FLOW.projectControl.get('newlyCreated') === this.get('content')) classes += " newlyCreated";
 
     return classes;
-  }.property('FLOW.projectControl.moveTarget', 'FLOW.projectControl.copyTarget', 'FLOW.projectControl.currentProject'),
+  }).property('FLOW.projectControl.moveTarget', 'FLOW.projectControl.copyTarget', 'FLOW.projectControl.currentProject'),
 
   toggleEditFolderName: function(evt) {
     this.set('folderEdit', !this.get('folderEdit'));
   },
 
-  isFolder: function() {
+  isFolder: Ember.computed(function() {
     return FLOW.projectControl.isProjectFolder(this.content);
-  }.property(),
+  }).property(),
 
   formatDate: function(datetime) {
     if (datetime === "") return "";
@@ -296,43 +298,43 @@ FLOW.ProjectItemView = FLOW.View.extend({
     return date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate();
   },
 
-  created: function() {
+  created: Ember.computed(function() {
     return this.formatDate(this.content.get('createdDateTime'));
-  }.property('this.content.createdDateTime'),
+  }).property('this.content.createdDateTime'),
 
-  modified: function() {
+  modified: Ember.computed(function() {
     return this.formatDate(this.content.get('lastUpdateDateTime'));
-  }.property('this.content.lastUpdateDateTime'),
+  }).property('this.content.lastUpdateDateTime'),
 
-  isPrivate: function() {
+  isPrivate: Ember.computed(function() {
     return this.content.get('privacyLevel') === "PRIVATE";
-  }.property(),
+  }).property(),
 
-  language: function() {
+  language: Ember.computed(function() {
     var langs = {en: "English", es: "Español", fr: "Français"};
     return langs[this.content.get('defaultLanguageCode')];
-  }.property(),
+  }).property(),
 
-  hideFolderSurveyDeleteButton: function () {
+  hideFolderSurveyDeleteButton: Ember.computed(function () {
     var c = this.get('content');
     var permissions = FLOW.projectControl.get('currentFolderPermissions');
     return permissions.indexOf("PROJECT_FOLDER_DELETE") < 0 || !Ember.empty(c.get('surveyList'));
-  }.property(),
+  }).property(),
 
-  showSurveyEditButton: function() {
+  showSurveyEditButton: Ember.computed(function() {
     var survey = this.get('content');
     return FLOW.permControl.canEditSurvey(survey) || FLOW.projectControl.get('newlyCreated') === survey;
-  }.property(),
+  }).property(),
 
-  showSurveyMoveButton: function() {
+  showSurveyMoveButton: Ember.computed(function() {
     var survey = this.get('content');
     return FLOW.permControl.canEditSurvey(survey);
-  }.property(),
+  }).property(),
 
-  showSurveyCopyButton: function () {
+  showSurveyCopyButton: Ember.computed(function () {
     var survey = this.get('content');
     return FLOW.permControl.canEditSurvey(survey);
-  }.property()
+  }).property()
 });
 
 FLOW.FolderEditView = Ember.TextField.extend({
@@ -364,7 +366,7 @@ FLOW.FormTabView = Ember.View.extend({
   content: null,
   classNameBindings: ['classProperty'],
 
-  classProperty: function() {
+  classProperty: Ember.computed(function() {
 
     var form = this.get('content');
     var currentProject = FLOW.projectControl.get('currentProject');
@@ -382,5 +384,5 @@ FLOW.FormTabView = Ember.View.extend({
     if (isPublished) classString += ' published'
 
     return classString;
-  }.property('FLOW.selectedControl.selectedSurvey', 'FLOW.projectControl.currentProject.newLocaleSurveyId', 'content.status' ),
+  }).property('FLOW.selectedControl.selectedSurvey', 'FLOW.projectControl.currentProject.newLocaleSurveyId', 'content.status' ),
 });
diff --git a/Dashboard/app/js/lib/views/surveys/translations-view.js b/Dashboard/app/js/lib/views/surveys/translations-view.js
index 311047005a..6e2971cdf1 100644
--- a/Dashboard/app/js/lib/views/surveys/translations-view.js
+++ b/Dashboard/app/js/lib/views/surveys/translations-view.js
@@ -1,6 +1,6 @@
-FLOW.TranslationsView = FLOW.View.extend({
-  templateName: 'navSurveys/manage-translations',
+import template from '../../mixins/template';
 
+FLOW.TranslationsView = FLOW.View.extend(template('navSurveys/manage-translations'), {
   saveTranslationsAndClose: function () {
     FLOW.translationControl.saveTranslations();
     this.get('parentView').set('manageTranslations', false);
diff --git a/Dashboard/app/js/lib/views/views-public.js b/Dashboard/app/js/lib/views/views-public.js
index ff5eac4fb7..e173fcb165 100644
--- a/Dashboard/app/js/lib/views/views-public.js
+++ b/Dashboard/app/js/lib/views/views-public.js
@@ -5,12 +5,9 @@
 
 require('akvo-flow/core-common');
 require('akvo-flow/views/maps/map-views-common-public');
+import template from '../mixins/template';
 
-
-FLOW.ApplicationView = Ember.View.extend({
-  templateName: 'application/application-public',
-});
-
+FLOW.ApplicationView = Ember.View.extend(template('application/application-public'));
 
 FLOW.locale = function (i18nKey) {
   return 'Ember.STRINGS._select_survey_group';
@@ -66,7 +63,7 @@ FLOW.renderCaddisflyAnswer = function(json){
           }
 
           // contruct html
-          html = "<div><strong>" + name + "</strong></div>"
+          var html = "<div><strong>" + name + "</strong></div>"
           html += jsonParsed.result.map(function(item){
                   return "<br><div>" + item.name + " : " + item.value + " " + item.unit + "</div>";
               }).join("\n");
@@ -84,7 +81,7 @@ FLOW.renderCaddisflyAnswer = function(json){
 /*  Take a timestamp and render it as a date in format
     YYYY-mm-dd */
 function renderTimeStamp(timestamp) {
-  var d, t, date, month, year;
+  var d, t, date, month, year, monthString, dateString;
   t = parseInt(timestamp, 10);
   if (isNaN(t)) {
     return "";
@@ -216,6 +213,4 @@ Ember.Select.reopen({
   attributeBindings: ['size']
 });
 
-FLOW.FooterView = FLOW.View.extend({
-  templateName: 'application/footer-public'
-});
+FLOW.FooterView = FLOW.View.extend(template('application/footer-public'));
diff --git a/Dashboard/app/js/lib/views/views.js b/Dashboard/app/js/lib/views/views.js
index 0d40eba267..a6875850e1 100644
--- a/Dashboard/app/js/lib/views/views.js
+++ b/Dashboard/app/js/lib/views/views.js
@@ -1,3 +1,6 @@
+import observe from '../mixins/observe';
+import template from '../mixins/template'; 
+
 // ***********************************************//
 //                      Navigation views
 // ***********************************************//
@@ -23,14 +26,12 @@ require('akvo-flow/views/maps/map-views-common');
 require('akvo-flow/views/messages/message-view');
 require('akvo-flow/views/devices/devices-views');
 require('akvo-flow/views/devices/assignments-list-tab-view');
+require('akvo-flow/views/devices/assignments-list-view');
 require('akvo-flow/views/devices/assignment-edit-views');
 require('akvo-flow/views/devices/survey-bootstrap-view');
 require('akvo-flow/views/users/user-view');
 
-FLOW.ApplicationView = Ember.View.extend({
-  templateName: 'application/application',
-});
-
+FLOW.ApplicationView = Ember.View.extend(template('application/application'));
 
 FLOW.locale = function (i18nKey) {
   return 'Ember.STRINGS._select_survey_group';
@@ -93,7 +94,7 @@ FLOW.renderCaddisflyAnswer = function(json){
         var jsonParsed = JSON.parse(json);
 
         // contruct html
-        html = "<div><strong>" + jsonParsed.name + "</strong></div>";
+        var html = "<div><strong>" + jsonParsed.name + "</strong></div>";
         html += jsonParsed.result.map(function(item){
                 return "<br><div>" + item.name + " : " + item.value + " " + item.unit + "</div>";
             }).join("\n");
@@ -101,7 +102,7 @@ FLOW.renderCaddisflyAnswer = function(json){
 
         // get out image url
         if ('image' in jsonParsed) {
-          imageUrl = FLOW.Env.photo_url_root + jsonParsed.image.trim();
+          var imageUrl = FLOW.Env.photo_url_root + jsonParsed.image.trim();
           html += "<div class=\"signatureImage\"><img src=\"" + imageUrl +"\"/></div>";
         }
         return html;
@@ -115,7 +116,7 @@ FLOW.renderCaddisflyAnswer = function(json){
 
 Ember.Handlebars.registerHelper('placemarkDetail', function () {
   var answer, markup, question, cascadeJson, optionJson, cascadeString = "",
-  imageSrcAttr, signatureJson, photoJson, self=this;
+  imageSrcAttr, signatureJson, photoJson, responseType, self=this;
 
   responseType = Ember.get(this, 'type');
   question = Ember.get(this, 'questionText');
@@ -123,8 +124,8 @@ Ember.Handlebars.registerHelper('placemarkDetail', function () {
   answer = answer.replace(/\|/g, ' | '); // geo, option and cascade data
   if (responseType != 'SIGNATURE') {
     answer = answer.replace(/\//g, ' / '); // also split folder paths
+    answer = answer.replace(/\\/g, ''); // remove escape characters
   }
-  answer = answer.replace(/\\/g, ''); // remove escape characters
 
   if (responseType === 'CASCADE') {
 
@@ -218,7 +219,7 @@ Ember.Handlebars.registerHelper('drawGeoshapes', function () {
 /*  Take a timestamp and render it as a date in format
     YYYY-mm-dd */
 FLOW.renderTimeStamp = function(timestamp) {
-  var d, t, date, month, year;
+  var d, t, date, month, year, monthString, dateString;
   t = parseInt(timestamp, 10);
   if (isNaN(t)) {
   return "";
@@ -250,12 +251,16 @@ FLOW.renderTimeStamp = function(timestamp) {
 
 FLOW.renderDate = function(timestamp){
   if (timestamp) {
-    d = new Date(parseInt(timestamp, 10));
-    curr_date = d.getDate();
-    curr_month = d.getMonth() + 1;
-    curr_year = d.getFullYear();
-    curr_hour = d.getHours();
-    curr_min = d.getMinutes();
+    let d = new Date(parseInt(timestamp, 10));
+    let curr_date = d.getDate();
+    let curr_month = d.getMonth() + 1;
+    let curr_year = d.getFullYear();
+    let curr_hour = d.getHours();
+    let curr_min = d.getMinutes();
+    let monthString;
+    let dateString;
+    let hourString;
+    let minString;
 
     if (curr_month < 10) {
       monthString = "0" + curr_month.toString();
@@ -547,29 +552,28 @@ FLOW.registerViewHelper('date2', Ember.View.extend({
 // ********************************************************//
 //                      main navigation
 // ********************************************************//
-FLOW.NavigationView = Em.View.extend({
-  templateName: 'application/navigation',
+FLOW.NavigationView = Em.View.extend(template('application/navigation'), {
   selectedBinding: 'controller.selected',
 
-  showMapsButton: function () {
+  showMapsButton: Ember.computed(function () {
       return FLOW.Env.showMapsTab;
-  }.property('FLOW.Env.showMapsTab'),
+  }).property('FLOW.Env.showMapsTab'),
 
   NavItemView: Ember.View.extend({
     tagName: 'li',
     classNameBindings: 'isActive:current navItem'.w(),
 
-    navItem: function () {
+    navItem: Ember.computed(function () {
       return this.get('item');
-    }.property('item').cacheable(),
+    }).property('item').cacheable(),
 
-    isActive: function () {
+    isActive: Ember.computed(function () {
       return this.get('item') === this.get('parentView.selected');
-    }.property('item', 'parentView.selected').cacheable(),
+    }).property('item', 'parentView.selected').cacheable(),
 
-    showDevicesButton: function () {
+    showDevicesButton: Ember.computed(function () {
       return FLOW.permControl.get('canManageDevices');
-    }.property(),
+    }).property(),
 
     eventManager: Ember.Object.create({
       click: function(event, clickedView) {
@@ -669,154 +673,81 @@ FLOW.DateField2 = Ember.TextField.extend({
   }
 });
 
-// home screen view
-FLOW.NavHomeView = Ember.View.extend({
-  templateName: 'navHome/nav-home'
-});
-
-// project views
-FLOW.NavProjectsView = Ember.View.extend({
-  templateName: 'navProjects/nav-projects-main'
-});
-
 // surveys views
-FLOW.NavSurveysView = Ember.View.extend({
-  templateName: 'navSurveys/nav-surveys'
-});
-FLOW.NavSurveysMainView = Ember.View.extend({
-  templateName: 'navSurveys/nav-surveys-main'
-});
+FLOW.NavSurveysView = Ember.View.extend(template('navSurveys/nav-surveys'));
+FLOW.NavSurveysMainView = Ember.View.extend(template('navSurveys/nav-surveys-main'));
 
-FLOW.NavSurveysEditView = Ember.View.extend({
-  templateName: 'navSurveys/nav-surveys-edit'
-});
+FLOW.NavSurveysEditView = Ember.View.extend(template('navSurveys/nav-surveys-edit'));
 
-FLOW.ManageNotificationsView = Ember.View.extend({
-  templateName: 'navSurveys/manage-notifications'
-});
+FLOW.ManageNotificationsView = Ember.View.extend(template('navSurveys/manage-notifications'));
 
-FLOW.ManageTranslationsView = Ember.View.extend({
-  templateName: 'navSurveys/manage-translations'
-});
+FLOW.ManageTranslationsView = Ember.View.extend(template('navSurveys/manage-translations'));
 
-FLOW.EditQuestionsView = Ember.View.extend({
-  templateName: 'navSurveys/edit-questions'
-});
+FLOW.EditQuestionsView = Ember.View.extend(template('navSurveys/edit-questions'));
 
 // devices views
-FLOW.NavDevicesView = Ember.View.extend({
-  templateName: 'navDevices/nav-devices'
-});
+FLOW.NavDevicesView = Ember.View.extend(template('navDevices/nav-devices'));
 
-FLOW.CurrentDevicesView = FLOW.View.extend({
-  templateName: 'navDevices/devices-list-tab/devices-list'
-});
+FLOW.CurrentDevicesView = FLOW.View.extend(template('navDevices/devices-list-tab/devices-list'));
 
-FLOW.AssignSurveysOverviewView = FLOW.View.extend({
-  templateName: 'navDevices/assignment-list-tab/assignment-list'
-});
+FLOW.AssignSurveysOverviewView = FLOW.View.extend(template('navDevices/assignment-list-tab/assignment-list'));
 
-FLOW.EditSurveyAssignmentView = Ember.View.extend({
-  templateName: 'navDevices/assignment-edit-tab/assignment-edit'
-});
+FLOW.EditSurveyAssignmentView = Ember.View.extend(template('navDevices/assignment-edit-tab/assignment-edit'));
 
-FLOW.SurveyBootstrapView = FLOW.View.extend({
-  templateName: 'navDevices/bootstrap-tab/survey-bootstrap'
-});
+FLOW.SurveyBootstrapView = FLOW.View.extend(template('navDevices/bootstrap-tab/survey-bootstrap'));
 
 // data views
-FLOW.NavDataView = Ember.View.extend({
-  templateName: 'navData/nav-data'
-});
+FLOW.NavDataView = Ember.View.extend(template('navData/nav-data'));
 
-FLOW.InspectDataView = Ember.View.extend({
-  templateName: 'navData/inspect-data'
-});
+FLOW.InspectDataView = Ember.View.extend(template('navData/inspect-data'));
 
-FLOW.BulkUploadView = Ember.View.extend({
-  templateName: 'navData/bulk-upload'
-});
+FLOW.BulkUploadView = Ember.View.extend(template('navData/bulk-upload'));
 
-FLOW.CascadeResourcesView = Ember.View.extend({
-	  templateName: 'navData/cascade-resources'
-});
+FLOW.CascadeResourcesView = Ember.View.extend(template('navData/cascade-resources'));
 
-FLOW.MonitoringDataView = Ember.View.extend({
-  templateName: 'navData/monitoring-data'
-});
+FLOW.MonitoringDataView = Ember.View.extend(template('navData/monitoring-data'));
 
-FLOW.ChartReportsView = Ember.View.extend({
-  templateName: 'navReports/chart-reports'
-});
+FLOW.ChartReportsView = Ember.View.extend(template('navReports/chart-reports'));
 
 // resources views
-FLOW.NavResourcesView = Ember.View.extend({
-  templateName: 'navResources/nav-resources'
-});
+FLOW.NavResourcesView = Ember.View.extend(template('navResources/nav-resources'));
 
 // applets
-FLOW.BootstrapApplet = Ember.View.extend({
-  templateName: 'navDevices/bootstrap-tab/applets/bootstrap-applet'
-});
+FLOW.rawDataReportApplet = Ember.View.extend(template('navReports/applets/raw-data-report-applet'));
 
-FLOW.rawDataReportApplet = Ember.View.extend({
-  templateName: 'navReports/applets/raw-data-report-applet'
-});
+FLOW.comprehensiveReportApplet = Ember.View.extend(template('navReports/applets/comprehensive-report-applet'));
 
-FLOW.comprehensiveReportApplet = Ember.View.extend({
-  templateName: 'navReports/applets/comprehensive-report-applet'
-});
+FLOW.googleEarthFileApplet = Ember.View.extend(template('navReports/applets/google-earth-file-applet'));
 
-FLOW.googleEarthFileApplet = Ember.View.extend({
-  templateName: 'navReports/applets/google-earth-file-applet'
-});
+FLOW.surveyFormApplet = Ember.View.extend(template('navReports/applets/survey-form-applet'));
 
-FLOW.surveyFormApplet = Ember.View.extend({
-  templateName: 'navReports/applets/survey-form-applet'
-});
+FLOW.bulkImportApplet = Ember.View.extend(template('navData/applets/bulk-import-applet'));
 
-FLOW.bulkImportApplet = Ember.View.extend({
-  templateName: 'navData/applets/bulk-import-applet'
-});
-
-FLOW.rawDataImportApplet = Ember.View.extend({
-  templateName: 'navData/applets/raw-data-import-applet'
-});
+FLOW.rawDataImportApplet = Ember.View.extend(template('navData/applets/raw-data-import-applet'));
 
 // users views
-FLOW.NavUsersView = Ember.View.extend({
-  templateName: 'navUsers/nav-users'
-});
+FLOW.NavUsersView = Ember.View.extend(template('navUsers/nav-users'));
 
 // Messages views
-FLOW.NavMessagesView = Ember.View.extend({
-  templateName: 'navMessages/nav-messages'
-});
+FLOW.NavMessagesView = Ember.View.extend(template('navMessages/nav-messages'));
 
 // admin views
-FLOW.NavAdminView = FLOW.View.extend({
-  templateName: 'navAdmin/nav-admin'
-});
+FLOW.NavAdminView = FLOW.View.extend(template('navAdmin/nav-admin'));
 
-FLOW.HeaderView = FLOW.View.extend({
-  templateName: 'application/header-common'
-});
+FLOW.HeaderView = FLOW.View.extend(template('application/header-common'));
 
-FLOW.FooterView = FLOW.View.extend({
-  templateName: 'application/footer'
-});
+FLOW.FooterView = FLOW.View.extend(template('application/footer'));
 
 // ********************************************************//
 //             Subnavigation for the Data tabs
 // ********************************************************//
-FLOW.DatasubnavView = FLOW.View.extend({
-  templateName: 'navData/data-subnav',
-  selectedBinding: 'controller.selected',
+FLOW.DatasubnavView = FLOW.View.extend(template('navData/data-subnav'), {
+selectedBinding: 'controller.selected',
   NavItemView: Ember.View.extend({
     tagName: 'li',
     classNameBindings: 'isActive:active'.w(),
 
-    isActive: function () {
+    isActive: Ember.computed(function () {
       if (this.get('item') === this.get('parentView.selected') && this.get('parentView.selected') === "bulkUpload") {
         FLOW.uploader.set('bulkUpload', true);
       } else {
@@ -825,51 +756,49 @@ FLOW.DatasubnavView = FLOW.View.extend({
         }
       }
       return this.get('item') === this.get('parentView.selected');
-    }.property('item', 'parentView.selected').cacheable(),
+    }).property('item', 'parentView.selected').cacheable(),
 
-    showDataCleaningButton: function () {
+    showDataCleaningButton: Ember.computed(function () {
         return FLOW.permControl.get('canCleanData');
-    }.property()
+    }).property()
   })
 });
 
 // ********************************************************//
 //             Subnavigation for the Device tabs
 // ********************************************************//
-FLOW.DevicesSubnavView = FLOW.View.extend({
-  templateName: 'navDevices/devices-subnav',
+FLOW.DevicesSubnavView = FLOW.View.extend(template('navDevices/devices-subnav'), {
   selectedBinding: 'controller.selected',
   NavItemView: Ember.View.extend({
     tagName: 'li',
     classNameBindings: 'isActive:active'.w(),
 
-    isActive: function () {
+    isActive: Ember.computed(function () {
       return this.get('item') === this.get('parentView.selected');
-    }.property('item', 'parentView.selected').cacheable()
+    }).property('item', 'parentView.selected').cacheable()
   })
 });
 
 // ********************************************************//
 //             Subnavigation for the Resources tabs
 // ********************************************************//
-FLOW.ResourcesSubnavView = Em.View.extend({
-  templateName: 'navResources/resources-subnav',
+FLOW.ResourcesSubnavView = Em.View.extend(template('navResources/resources-subnav'), {
   selectedBinding: 'controller.selected',
   NavItemView: Ember.View.extend({
     tagName: 'li',
     classNameBindings: 'isActive:active'.w(),
 
-    isActive: function () {
+    isActive: Ember.computed(function () {
       return this.get('item') === this.get('parentView.selected');
-    }.property('item', 'parentView.selected').cacheable(),
+    }).property('item', 'parentView.selected').cacheable(),
 
-    showCascadeResourcesButton: function () {
+    showCascadeResourcesButton: Ember.computed(function () {
       return FLOW.permControl.get('canManageCascadeResources');
-    }.property(),
+    }).property(),
 
-    showDataApprovalButton: function () {
+    showDataApprovalButton: Ember.computed(function () {
         return FLOW.Env.enableDataApproval && FLOW.permControl.get('canManageDataAppoval');
-    }.property()
+    }).property()
   })
 });
 
@@ -884,13 +813,13 @@ FLOW.ColumnView = Ember.View.extend({
 
   classNameBindings: ['isActiveAsc:sorting_asc', 'isActiveDesc:sorting_desc'],
 
-  isActiveAsc: function () {
+  isActiveAsc: Ember.computed(function () {
     return this.get('item') === FLOW.tableColumnControl.get('selected') && FLOW.tableColumnControl.get('sortAscending') === true;
-  }.property('item', 'FLOW.tableColumnControl.selected', 'FLOW.tableColumnControl.sortAscending').cacheable(),
+  }).property('item', 'FLOW.tableColumnControl.selected', 'FLOW.tableColumnControl.sortAscending').cacheable(),
 
-  isActiveDesc: function () {
+  isActiveDesc: Ember.computed(function () {
     return this.get('item') === FLOW.tableColumnControl.get('selected') && FLOW.tableColumnControl.get('sortAscending') === false;
-  }.property('item', 'FLOW.tableColumnControl.selected', 'FLOW.tableColumnControl.sortAscending').cacheable(),
+  }).property('item', 'FLOW.tableColumnControl.selected', 'FLOW.tableColumnControl.sortAscending').cacheable(),
 
   sort: function () {
     if ((this.get('isActiveAsc')) || (this.get('isActiveDesc'))) {
@@ -912,7 +841,9 @@ FLOW.ColumnView = Ember.View.extend({
 
 var set = Ember.set,
   get = Ember.get;
-Ember.RadioButton = Ember.View.extend({
+Ember.RadioButton = Ember.View.extend(observe({
+    value: 'bindingChanged',
+}), {
   title: null,
   checked: false,
   group: "radio_button",
@@ -926,7 +857,7 @@ Ember.RadioButton = Ember.View.extend({
     if (this.get("option") == get(this, 'value')) {
       this.set("checked", true);
     }
-  }.observes("value"),
+  },
 
   change: function () {
     Ember.run.once(this, this._updateElementValue);
@@ -938,7 +869,9 @@ Ember.RadioButton = Ember.View.extend({
   }
 });
 
-FLOW.SelectFolder = Ember.Select.extend({
+FLOW.SelectFolder = Ember.Select.extend(observe({
+    value: 'onChange',
+}), {
   controller: null,
 
   init: function() {
@@ -984,7 +917,7 @@ FLOW.SelectFolder = Ember.Select.extend({
     } else {
       FLOW.selectedControl.set('selectedSurveyGroup', null);
     }
-  }.observes('value'),
+  },
 });
 
 
diff --git a/Dashboard/app/js/lib/webpack-public-path.js b/Dashboard/app/js/lib/webpack-public-path.js
new file mode 100755
index 0000000000..6347b89f23
--- /dev/null
+++ b/Dashboard/app/js/lib/webpack-public-path.js
@@ -0,0 +1,11 @@
+/* eslint-disable camelcase */
+// Dynamically set the webpack public path at runtime below
+// This magic global is used by webpack to set the public path at runtime.
+// The public path is set dynamically to avoid the following issues:
+// 1. https://github.com/coryhouse/react-slingshot/issues/205
+// 2. https://github.com/coryhouse/react-slingshot/issues/181
+// 3. https://github.com/coryhouse/react-slingshot/pull/125
+// Documentation: https://webpack.js.org/configuration/output/#output-publicpath
+// eslint-disable-next-line no-undef
+__webpack_public_path__ = `${window.location.protocol}//${window.location.host}/`;
+
diff --git a/Dashboard/app/js/plugins/flowDashboard.js b/Dashboard/app/js/plugins/flowDashboard.js
index f37575ebe5..5cb635284d 100644
--- a/Dashboard/app/js/plugins/flowDashboard.js
+++ b/Dashboard/app/js/plugins/flowDashboard.js
@@ -1,6 +1,6 @@
 // Akvo Flow DashBoard Interaction
 // loic@akvo.org
-this.tooltip = function () {
+const tooltip = function () {
   /* CONFIG */
   var xOffset = 10;
   var yOffset = 20;
diff --git a/Dashboard/app/js/plugins/geocells.js b/Dashboard/app/js/plugins/geocells.js
index bd7d49fca7..3b31154355 100644
--- a/Dashboard/app/js/plugins/geocells.js
+++ b/Dashboard/app/js/plugins/geocells.js
@@ -122,12 +122,12 @@ function create_geomodel() {
     return (this.match("^"+str)==str);
   };
 
-  // adding the Array and String functions below, which are used by the 
+  // adding the Array and String functions below, which are used by the
   // interpolate function and others
   function arrayAddAll(target) {
     var a, i;
     for (a = 1;  a < arguments.length;  a++) {
-      arr = arguments[a];
+      var arr = arguments[a];
       for (i = 0;  i < arr.length;  i++) {
         target.push(arr[i]);
       }
diff --git a/Dashboard/app/js/plugins/loader.js b/Dashboard/app/js/plugins/loader.js
index 5e6f713612..0d4b56adc8 100755
--- a/Dashboard/app/js/plugins/loader.js
+++ b/Dashboard/app/js/plugins/loader.js
@@ -1,4 +1,4 @@
-(function(window) {
+(function() {
   function requireWrapper(self) {
     var require = function() {
       return self.require.apply(self, arguments);
@@ -57,4 +57,4 @@
   };
 
   window.loader = new Loader();
-})(this);
+})();
diff --git a/Dashboard/app/js/plugins/tooltip.js b/Dashboard/app/js/plugins/tooltip.js
index b8494c34a8..7434ffc003 100644
--- a/Dashboard/app/js/plugins/tooltip.js
+++ b/Dashboard/app/js/plugins/tooltip.js
@@ -1,7 +1,7 @@
-this.tooltip = function() {
+window.tooltip = function() {
 	/* CONFIG */
-	xOffset = 10;
-	yOffset = 20;
+	const 	xOffset = 10;
+	const 	yOffset = 20;
 	// these 2 variable determine popup's distance from the cursor
 	// you might want to adjust to get the right result
 	/* END CONFIG */
@@ -26,5 +26,5 @@ this.tooltip = function() {
 };
 // starting the script on page load
 $(document).ready(function() {
-	tooltip();
+	window.tooltip();
 });
\ No newline at end of file
diff --git a/Dashboard/app/js/templates/application/application.handlebars b/Dashboard/app/js/templates/application/application.handlebars
index eb9a43fee9..536a8b3382 100644
--- a/Dashboard/app/js/templates/application/application.handlebars
+++ b/Dashboard/app/js/templates/application/application.handlebars
@@ -29,7 +29,7 @@
       <div class="buttons menuCentre">
         <ul>
           {{#if FLOW.dialogControl.showOK}} <li><a {{action "doOK" target="FLOW.dialogControl"}} class="ok smallBtn">{{t _ok}}</a></li>{{/if}}
-          {{#if FLOW.dialogControl.showCANCEL}} <li><a {{action "doCANCEL" target="FLOW.dialogControl"}}} class="cancel">{{t _cancel}}</a></li>{{/if}}
+          {{#if FLOW.dialogControl.showCANCEL}} <li><a {{action "doCANCEL" target="FLOW.dialogControl"}} class="cancel">{{t _cancel}}</a></li>{{/if}}
         </ul>
       </div>
     </div>
diff --git a/Dashboard/app/js/templates/application/footer.handlebars b/Dashboard/app/js/templates/application/footer.handlebars
index 1e1c8e933e..339465d316 100644
--- a/Dashboard/app/js/templates/application/footer.handlebars
+++ b/Dashboard/app/js/templates/application/footer.handlebars
@@ -22,5 +22,5 @@
 		</ul>
 	</nav>
   </div>
-  <div><small>__VERSION__ - {{t _copyright}} &copy; 2012-2019 <a href="http://www.akvo.org" title="akvo.org" target="_blank">akvo.org</a></small></div>
+  <div><small>{{__VERSION__}} - {{t _copyright}} &copy; 2012-2019 <a href="http://www.akvo.org" title="akvo.org" target="_blank">akvo.org</a></small></div>
  <footer>
diff --git a/Dashboard/app/js/templates/navDevices/assignment-list-tab/assignment-list.handlebars b/Dashboard/app/js/templates/navDevices/assignment-list-tab/assignment-list.handlebars
index 4f90e1f8f9..7964581bd7 100644
--- a/Dashboard/app/js/templates/navDevices/assignment-list-tab/assignment-list.handlebars
+++ b/Dashboard/app/js/templates/navDevices/assignment-list-tab/assignment-list.handlebars
@@ -1,6 +1,9 @@
 <section class="assignmentsListed" id="assignmentsList">
-  <!-- assignments TABLE-->
+
+  <!-- assignments REACT-->
+  {{#view FLOW.AssignmentsListView}}{{/view}}
   
+  <!-- assignments TABLE-->
   {{#view FLOW.AssignmentsListTabView}}
   <div class="deviceControls">
     <a {{action "createNewAssignment" target="this"}} class="btnOutline">{{t _create_new_assignment}}</a></div>
diff --git a/Dashboard/app/js/templates/navDevices/devices-list-tab/devices-list.handlebars b/Dashboard/app/js/templates/navDevices/devices-list-tab/devices-list.handlebars
index 16799505ac..4a31ebbcb0 100644
--- a/Dashboard/app/js/templates/navDevices/devices-list-tab/devices-list.handlebars
+++ b/Dashboard/app/js/templates/navDevices/devices-list-tab/devices-list.handlebars
@@ -71,7 +71,7 @@
               <div class="buttons menuCentre">
                 <ul>
                   <li><a {{action "doAddToGroup" target="this"}} class="ok smallBtn">{{t _ok}}</a></li>
-                  <li><a {{action "cancelAddToGroup" target="this"}}} class="cancel">{{t _cancel}}</a></li>
+                  <li><a {{action "cancelAddToGroup" target="this"}} class="cancel">{{t _cancel}}</a></li>
                 </ul>
               </div>
             </div>
@@ -88,7 +88,7 @@
               <div class="buttons menuCentre">
                 <ul>
                   <li><a {{action "doRemoveFromGroup" target="this"}} class="ok smallBtn">{{t _ok}}</a></li>
-                  <li><a {{action "cancelRemoveFromGroup" target="this"}}} class="cancel">{{t _cancel}}</a></li>
+                  <li><a {{action "cancelRemoveFromGroup" target="this"}} class="cancel">{{t _cancel}}</a></li>
                 </ul>
               </div>
             </div>
@@ -128,7 +128,7 @@
               <div class="buttons menuCentre">
                 <ul>
                   <li><a {{action "doManageDeviceGroups" target="this"}} class="ok smallBtn">{{t _save}}</a></li>
-                  <li><a {{action "cancelManageDeviceGroups" target="this"}}} class="cancel">{{t _cancel}}</a></li>
+                  <li><a {{action "cancelManageDeviceGroups" target="this"}} class="cancel">{{t _cancel}}</a></li>
                 </ul>
               </div>
             </div>
diff --git a/Dashboard/app/js/templates/navSurveys/preview-view.handlebars b/Dashboard/app/js/templates/navSurveys/preview-view.handlebars
index 9ecf581bad..dc013f4ddc 100644
--- a/Dashboard/app/js/templates/navSurveys/preview-view.handlebars
+++ b/Dashboard/app/js/templates/navSurveys/preview-view.handlebars
@@ -11,7 +11,7 @@
            {{#view FLOW.PreviewQuestionView contentBinding="Q"}}
              {{#if view.isVisible}}
 			 <div class="previewQuestion"> 
-                <h1 class="questionNbr"><span>{{Q.order}}} </span>{{Q.text}}</h1>
+                <h1 class="questionNbr"><span>{{Q.order}} </span>{{Q.text}}</h1>
                     {{#if view.isOptionType}}
                        {{#each view.optionsList}}
                        <!-- FIXME this should be checkbuttons if Allow Multiple is true -->
diff --git a/Dashboard/app/js/templates/navSurveys/project.handlebars b/Dashboard/app/js/templates/navSurveys/project.handlebars
index a79863af3e..bbb080b80e 100644
--- a/Dashboard/app/js/templates/navSurveys/project.handlebars
+++ b/Dashboard/app/js/templates/navSurveys/project.handlebars
@@ -156,7 +156,7 @@
             {{/if}}
                 <nav class="tabNav floats-in">
                   <ul>
-                    {{#each form in FLOW.surveyControl}}
+                    {{#each form in FLOW.surveyControl.orderedForms}}
                       {{#view FLOW.FormTabView contentBinding="form"}}
                         <a {{action "selectForm" form target="FLOW.surveyControl"}}>{{form.name}}</a></li>
                       {{/view}}
diff --git a/Dashboard/app/js/templates/navSurveys/question-option.handlebars b/Dashboard/app/js/templates/navSurveys/question-option.handlebars
index 6004a2ee85..24f249fce7 100644
--- a/Dashboard/app/js/templates/navSurveys/question-option.handlebars
+++ b/Dashboard/app/js/templates/navSurveys/question-option.handlebars
@@ -1,3 +1,13 @@
 {{view Ember.TextField valueBinding="view.content.code" placeholderBinding="Ember.STRINGS._code" size=5}}
 {{view Ember.TextField valueBinding="view.content.text" placeholderBinding="Ember.STRINGS._text_placeholder" size=15}}
-<a {{action deleteOption target="FLOW.questionOptionsControl"}}>{{t _delete_option}}</a>
\ No newline at end of file
+{{#if view.topOption}}
+<a class="not-active">{{t _move_up}}</a>
+{{else}}
+<a {{action moveOptionUp target="FLOW.questionOptionsControl"}}>{{t _move_up}}</a>
+{{/if}}
+{{#if view.bottomOption}}
+<a class="not-active">{{t _move_down}}</a>
+{{else}}
+<a {{action moveOptionDown target="FLOW.questionOptionsControl"}}>{{t _move_down}}</a>
+{{/if}}
+<a {{action deleteOption target="FLOW.questionOptionsControl"}}>{{t _delete_option}}</a>
diff --git a/Dashboard/app/js/templates/navSurveys/question-view.handlebars b/Dashboard/app/js/templates/navSurveys/question-view.handlebars
index d1e446a169..a0f52ecf96 100644
--- a/Dashboard/app/js/templates/navSurveys/question-view.handlebars
+++ b/Dashboard/app/js/templates/navSurveys/question-view.handlebars
@@ -2,7 +2,7 @@
 
 <div class="innerContent" id="innerContent_01">
   {{#if view.amOpenQuestion}}
-    <h1 class="questionNbr"><span>{{view.content.order}}} </span>{{view.content.text}}</h1>
+    <h1 class="questionNbr"><span>{{view.content.order}} </span>{{view.content.text}}</h1>
     <label>{{t _question_text}}:
     {{#if view.questionValidationFailure }}
       <span style="color:red">{{view.questionValidationFailureReason}}</span>
@@ -83,6 +83,9 @@
         {{#if FLOW.questionOptionsControl.reservedCode}}
         <br><span style="color:red">{{t _reserved_code}}</span>
         {{/if}}
+        {{#if FLOW.questionOptionsControl.maxLength}}
+        <br><span style="color:red">{{t _option_max_length}}</span>
+        {{/if}}
       </p>
       <div class="optionListView">
     	  {{view FLOW.OptionListView contentBinding="FLOW.questionOptionsControl"}}
@@ -139,14 +142,41 @@
         <h1 class="answerNbr">{{t _settings}}: </h1>
          <label class="selectinLabel dependencySelect">
          {{#if view.showCaddisflyTests}}
-         {{t _choose_caddisfly_question_resource}}: {{tooltip _choose_caddisfly_question_resource_tooltip}}
+         {{t _choose_caddisfly_question_resource}}: {{tooltip _choose_caddisfly_question_resource_tooltip}}<br>
+            {{view Ember.Select
+            contentBinding="view.caddisflyTestSamples"
+            selectionBinding="view.selectedCaddisflyTestSample"
+            optionLabelPath="content.sample"
+            optionValuePath="content.keyId"
+            prompt=""
+            promptBinding="Ember.STRINGS._select_caddisfly_test_sample"}}
+            {{#if view.selectedCaddisflyTestSample}}
+            {{view Ember.Select
+            contentBinding="view.caddisflyTestNames"
+            selectionBinding="view.selectedCaddisflyTestName"
+            optionLabelPath="content.name"
+            optionValuePath="content.keyId"
+            prompt=""
+            promptBinding="Ember.STRINGS._select_caddisfly_test_name"}}
+            {{/if}}
+            {{#if view.selectedCaddisflyTestName}}
+            {{view Ember.Select
+            contentBinding="view.caddisflyTestBrands"
+            selectionBinding="view.selectedCaddisflyTestBrand"
+            optionLabelPath="content.brandDisplayName"
+            optionValuePath="content.keyId"
+            prompt=""
+            promptBinding="Ember.STRINGS._select_caddisfly_test_brand"}}
+            {{/if}}
+            {{#if view.selectedCaddisflyTestBrand}}
             {{view Ember.Select
-            contentBinding="FLOW.router.caddisflyResourceController"
+            contentBinding="view.caddisflyTestDetails"
             selectionBinding="FLOW.selectedControl.selectedCaddisflyResource"
-            optionLabelPath="content.displayName"
+            optionLabelPath="content.detailsDisplayName"
             optionValuePath="content.keyId"
             prompt=""
-            promptBinding="Ember.STRINGS._select_caddisfly_test"}}
+            promptBinding="Ember.STRINGS._select_caddisfly_test_details"}}
+            {{/if}}
         {{else}}
         <div class="errorLoading">{{t _failed_load_caddisfly_tests}}</div>
         {{/if}}
@@ -218,11 +248,21 @@
         {{#if FLOW.questionOptionsControl.reservedCode}}
         <li><a class="button noChanges" id="standardBtn_01">{{t _save_question}}</a> </li>
         {{else}}
+        {{#if FLOW.questionOptionsControl.maxLength}}
+        <li><a class="button noChanges" id="standardBtn_01">{{t _save_question}}</a> </li>
+        {{else}}
+        <li><a class="button" id="standardBtn_01" {{action "doSaveEditQuestion" target="this"}}>{{t _save_question}}</a> </li>
+        {{/if}}{{/if}}{{/if}}{{/if}}{{/if}}{{/if}}{{/if}}{{/if}}
+        {{else}}
+        {{#if view.amCaddisflyType}}
+        {{#unless FLOW.selectedControl.selectedCaddisflyResource}}
+        <li><a class="button noChanges" id="standardBtn_01">{{t _save_question}}</a> </li>
+        {{else}}
         <li><a class="button" id="standardBtn_01" {{action "doSaveEditQuestion" target="this"}}>{{t _save_question}}</a> </li>
-        {{/if}}{{/if}}{{/if}}{{/if}}{{/if}}{{/if}}{{/if}}
+        {{/unless}}
         {{else}}
         <li><a class="button" id="standardBtn_01" {{action "doSaveEditQuestion" target="this"}}>{{t _save_question}}</a> </li>
-        {{/if}}{{/if}}{{/if}}
+        {{/if}}{{/if}}{{/if}}{{/if}}
         <li><a class="cancel" id="standardBtn_01" {{action "doCancelEditQuestion" target="this"}}>{{t _cancel}}</a> </li>
       </ul>
     </nav>
diff --git a/Dashboard/app/public.html b/Dashboard/app/public.ejs
similarity index 65%
rename from Dashboard/app/public.html
rename to Dashboard/app/public.ejs
index 09253aa2ce..78938c622a 100644
--- a/Dashboard/app/public.html
+++ b/Dashboard/app/public.ejs
@@ -21,9 +21,11 @@
       <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
     <!-- Stylesheets -->
-    <link rel="stylesheet" href="/publicmap/css/screen.css"  media="screen,projection" />
     <script src='https://api.mapbox.com/mapbox.js/v3.1.1/mapbox.js'></script>
     <link href='https://api.mapbox.com/mapbox.js/v3.1.1/mapbox.css' rel='stylesheet'/>
+    <script type="text/javascript">
+        window.FLOW = window.FLOW || {};
+    </script>
   </head>
   <body class="publicPage">
 
@@ -36,34 +38,10 @@
   <script src="https://cdnjs.cloudflare.com/ajax/libs/datatables/1.9.2/jquery.dataTables.min.js" integrity="sha384-l4ztyMkjOikIXT8yH7aYF35ElUqxfPgSf9d+fUgST1ZgUFJ8/PD4ZNc8tk49GQxx" crossorigin="anonymous"></script>
 
 	<script src="/publicmap/js/loader.js"></script>
- <script src="/publicmap/js/geocells.js"></script>
   <script src="/flowenv.js"></script>
-	<script src="/publicmap/js/app.js"></script>
-	<script>
-    loader.require('akvo-flow/main-public');
-	</script>
-  <script>
-    var regionBias = FLOW.Env.googleMapsRegionBias;
-    var region = regionBias ? '&region=' + regionBias : '';
-    document.write('<script src="https://maps.google.com/maps/api/js?v=3.2&sensor=false' + region + '"><\/script>');
-  </script>
-  <script src="/vendorjs/js/vendor/Google.js"></script>
+  <script src="/currentuser.js"></script>
+
   <script src="/publicmap/js/flowDashboard.js"></script>
-  <script type="text/javascript">
-    var _paq = _paq || [];
-    _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-    _paq.push(["setCookieDomain", "*.akvoflow.org"]);
-    _paq.push(["setDomains", ["*.akvoflow.org"]]);
-    _paq.push(["trackPageView"]);
-    _paq.push(["enableLinkTracking"]);
 
-    (function() {
-      var u=(("https:" == document.location.protocol) ? "https" : "http") + "://analytics.akvo.org/";
-      _paq.push(["setTrackerUrl", u+"piwik.php"]);
-      _paq.push(["setSiteId", "10"]);
-      var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-      g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-    })();
-  </script>
   </body>
 </html>
diff --git a/Dashboard/package-lock.json b/Dashboard/package-lock.json
new file mode 100644
index 0000000000..99d8041116
--- /dev/null
+++ b/Dashboard/package-lock.json
@@ -0,0 +1,11129 @@
+{
+  "name": "akvo-flow",
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
+      "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "7.0.0"
+      }
+    },
+    "@babel/generator": {
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.3.3.tgz",
+      "integrity": "sha512-aEADYwRRZjJyMnKN7llGIlircxTCofm3dtV5pmY6ob18MSIuipHpA2yZWkPlycwu5HJcx/pADS3zssd8eY7/6A==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "7.3.3",
+        "jsesc": "2.5.2",
+        "lodash": "4.17.11",
+        "source-map": "0.5.7",
+        "trim-right": "1.0.1"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "2.5.2",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
+      "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-get-function-arity": "7.0.0",
+        "@babel/template": "7.2.2",
+        "@babel/types": "7.3.3"
+      }
+    },
+    "@babel/helper-get-function-arity": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
+      "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "7.3.3"
+      }
+    },
+    "@babel/helper-plugin-utils": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz",
+      "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==",
+      "dev": true
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz",
+      "integrity": "sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "7.3.3"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
+      "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
+      "dev": true,
+      "requires": {
+        "chalk": "2.4.2",
+        "esutils": "2.0.2",
+        "js-tokens": "4.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.3"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.5.0"
+          }
+        },
+        "js-tokens": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "@babel/parser": {
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.3.3.tgz",
+      "integrity": "sha512-xsH1CJoln2r74hR+y7cg2B5JCPaTh+Hd+EbBRk9nWGSNspuo6krjhX0Om6RnRQuIvFq8wVXCLKH3kwKDYhanSg==",
+      "dev": true
+    },
+    "@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz",
+      "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "7.0.0"
+      }
+    },
+    "@babel/polyfill": {
+      "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.2.5.tgz",
+      "integrity": "sha512-8Y/t3MWThtMLYr0YNC/Q76tqN1w30+b0uQMeFUYauG2UGTR19zyUtFrAzT23zNtBxPp+LbE5E/nwV/q/r3y6ug==",
+      "dev": true,
+      "requires": {
+        "core-js": "2.6.5",
+        "regenerator-runtime": "0.12.1"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.12.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
+          "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/template": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.2.2.tgz",
+      "integrity": "sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "7.0.0",
+        "@babel/parser": "7.3.3",
+        "@babel/types": "7.3.3"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.2.3.tgz",
+      "integrity": "sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "7.0.0",
+        "@babel/generator": "7.3.3",
+        "@babel/helper-function-name": "7.1.0",
+        "@babel/helper-split-export-declaration": "7.0.0",
+        "@babel/parser": "7.3.3",
+        "@babel/types": "7.3.3",
+        "debug": "4.1.1",
+        "globals": "11.11.0",
+        "lodash": "4.17.11"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.1"
+          }
+        },
+        "globals": {
+          "version": "11.11.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.11.0.tgz",
+          "integrity": "sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/types": {
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.3.3.tgz",
+      "integrity": "sha512-2tACZ80Wg09UnPg5uGAOUvvInaqLk3l/IAhQzlxLQOIXacr6bMsra5SH6AWw/hIDRCSbCdHP2KzSOD+cT7TzMQ==",
+      "dev": true,
+      "requires": {
+        "esutils": "2.0.2",
+        "lodash": "4.17.11",
+        "to-fast-properties": "2.0.0"
+      },
+      "dependencies": {
+        "to-fast-properties": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+          "dev": true
+        }
+      }
+    },
+    "@webassemblyjs/ast": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
+      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5"
+      }
+    },
+    "@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
+      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-api-error": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
+      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-buffer": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
+      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-code-frame": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
+      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/wast-printer": "1.8.5"
+      }
+    },
+    "@webassemblyjs/helper-fsm": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
+      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-module-context": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
+      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "mamacro": "0.0.3"
+      }
+    },
+    "@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
+      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-wasm-section": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
+      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5"
+      }
+    },
+    "@webassemblyjs/ieee754": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
+      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
+      "dev": true,
+      "requires": {
+        "@xtuc/ieee754": "1.2.0"
+      }
+    },
+    "@webassemblyjs/leb128": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
+      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
+      "dev": true,
+      "requires": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/utf8": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
+      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
+      "dev": true
+    },
+    "@webassemblyjs/wasm-edit": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
+      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/helper-wasm-section": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-opt": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "@webassemblyjs/wast-printer": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wasm-gen": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
+      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wasm-opt": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
+      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wasm-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
+      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wast-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
+      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-code-frame": "1.8.5",
+        "@webassemblyjs/helper-fsm": "1.8.5",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/wast-printer": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
+      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
+    },
+    "@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
+    },
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
+    },
+    "acorn": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.0.tgz",
+      "integrity": "sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw==",
+      "dev": true
+    },
+    "acorn-dynamic-import": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz",
+      "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==",
+      "dev": true
+    },
+    "acorn-jsx": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz",
+      "integrity": "sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==",
+      "dev": true
+    },
+    "ajv": {
+      "version": "6.9.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz",
+      "integrity": "sha512-4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "2.0.1",
+        "fast-json-stable-stringify": "2.0.0",
+        "json-schema-traverse": "0.4.1",
+        "uri-js": "4.2.2"
+      }
+    },
+    "ajv-errors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
+      "dev": true
+    },
+    "ajv-keywords": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz",
+      "integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==",
+      "dev": true
+    },
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "dev": true
+    },
+    "ansi-colors": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
+      "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
+      "dev": true
+    },
+    "ansi-escapes": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "requires": {
+        "color-convert": "1.9.3"
+      }
+    },
+    "anymatch": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "micromatch": "2.3.11",
+        "normalize-path": "2.1.1"
+      }
+    },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true
+    },
+    "are-we-there-yet": {
+      "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.3.6"
+      }
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "1.0.3"
+      }
+    },
+    "aria-query": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
+      "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
+      "dev": true,
+      "requires": {
+        "ast-types-flow": "0.0.7",
+        "commander": "2.19.0"
+      }
+    },
+    "arr-diff": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "arr-flatten": "1.1.0"
+      }
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true
+    },
+    "array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+      "dev": true
+    },
+    "array-includes": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
+      "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.3",
+        "es-abstract": "1.13.0"
+      }
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "requires": {
+        "array-uniq": "1.0.3"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+      "dev": true,
+      "optional": true
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true
+    },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": "2.1.2"
+      }
+    },
+    "asn1.js": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
+      }
+    },
+    "assert": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+      "dev": true,
+      "requires": {
+        "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
+      }
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true
+    },
+    "ast-types-flow": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
+      "dev": true
+    },
+    "astral-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+      "dev": true
+    },
+    "async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
+      "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.11"
+      }
+    },
+    "async-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
+      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
+      "dev": true
+    },
+    "async-foreach": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
+      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true
+    },
+    "autoprefixer": {
+      "version": "9.4.9",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.4.9.tgz",
+      "integrity": "sha512-OyUl7KvbGBoFQbGQu51hMywz1aaVeud/6uX8r1R1DNcqFvqGUUy6+BDHnAZE8s5t5JyEObaSw+O1DpAdjAmLuw==",
+      "dev": true,
+      "requires": {
+        "browserslist": "4.4.2",
+        "caniuse-lite": "1.0.30000939",
+        "normalize-range": "0.1.2",
+        "num2fraction": "1.2.2",
+        "postcss": "7.0.14",
+        "postcss-value-parser": "3.3.1"
+      },
+      "dependencies": {
+        "browserslist": {
+          "version": "4.4.2",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.4.2.tgz",
+          "integrity": "sha512-ISS/AIAiHERJ3d45Fz0AVYKkgcy+F/eJHzKEvv1j0wwKGKD9T3BrwKr/5g45L+Y4XIK5PlTqefHciRFcfE1Jxg==",
+          "dev": true,
+          "requires": {
+            "caniuse-lite": "1.0.30000939",
+            "electron-to-chromium": "1.3.113",
+            "node-releases": "1.1.8"
+          }
+        }
+      }
+    },
+    "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
+    },
+    "aws4": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
+      "dev": true
+    },
+    "axobject-query": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz",
+      "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==",
+      "dev": true,
+      "requires": {
+        "ast-types-flow": "0.0.7"
+      }
+    },
+    "babel-cli": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz",
+      "integrity": "sha1-UCq1SHTX24itALiHoGODzgPQAvE=",
+      "dev": true,
+      "requires": {
+        "babel-core": "6.26.3",
+        "babel-polyfill": "6.26.0",
+        "babel-register": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "chokidar": "1.7.0",
+        "commander": "2.19.0",
+        "convert-source-map": "1.6.0",
+        "fs-readdir-recursive": "1.1.0",
+        "glob": "7.1.3",
+        "lodash": "4.17.11",
+        "output-file-sync": "1.1.2",
+        "path-is-absolute": "1.0.1",
+        "slash": "1.0.0",
+        "source-map": "0.5.7",
+        "v8flags": "2.1.1"
+      }
+    },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "requires": {
+        "chalk": "1.1.3",
+        "esutils": "2.0.2",
+        "js-tokens": "3.0.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+        }
+      }
+    },
+    "babel-core": {
+      "version": "6.26.3",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
+      "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
+      "requires": {
+        "babel-code-frame": "6.26.0",
+        "babel-generator": "6.26.1",
+        "babel-helpers": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-register": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "convert-source-map": "1.6.0",
+        "debug": "2.6.9",
+        "json5": "0.5.1",
+        "lodash": "4.17.11",
+        "minimatch": "3.0.4",
+        "path-is-absolute": "1.0.1",
+        "private": "0.1.8",
+        "slash": "1.0.0",
+        "source-map": "0.5.7"
+      }
+    },
+    "babel-eslint": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.1.tgz",
+      "integrity": "sha512-z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "7.0.0",
+        "@babel/parser": "7.3.3",
+        "@babel/traverse": "7.2.3",
+        "@babel/types": "7.3.3",
+        "eslint-scope": "3.7.1",
+        "eslint-visitor-keys": "1.0.0"
+      }
+    },
+    "babel-generator": {
+      "version": "6.26.1",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
+      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
+      "requires": {
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "detect-indent": "4.0.0",
+        "jsesc": "1.3.0",
+        "lodash": "4.17.11",
+        "source-map": "0.5.7",
+        "trim-right": "1.0.1"
+      }
+    },
+    "babel-helper-bindify-decorators": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
+      "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-builder-binary-assignment-operator-visitor": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
+      "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
+      "dev": true,
+      "requires": {
+        "babel-helper-explode-assignable-expression": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-builder-react-jsx": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz",
+      "integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "esutils": "2.0.2"
+      }
+    },
+    "babel-helper-call-delegate": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
+      "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
+      "dev": true,
+      "requires": {
+        "babel-helper-hoist-variables": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-define-map": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
+      "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "lodash": "4.17.11"
+      }
+    },
+    "babel-helper-explode-assignable-expression": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
+      "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-explode-class": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
+      "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
+      "dev": true,
+      "requires": {
+        "babel-helper-bindify-decorators": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
+      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
+      "dev": true,
+      "requires": {
+        "babel-helper-get-function-arity": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-get-function-arity": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
+      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-hoist-variables": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
+      "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-optimise-call-expression": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
+      "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-regex": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
+      "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "lodash": "4.17.11"
+      }
+    },
+    "babel-helper-remap-async-to-generator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
+      "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-replace-supers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
+      "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
+      "dev": true,
+      "requires": {
+        "babel-helper-optimise-call-expression": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helpers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
+      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
+      }
+    },
+    "babel-jest": {
+      "version": "24.1.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.1.0.tgz",
+      "integrity": "sha512-MLcagnVrO9ybQGLEfZUqnOzv36iQzU7Bj4elm39vCukumLVSfoX+tRy3/jW7lUKc7XdpRmB/jech6L/UCsSZjw==",
+      "dev": true,
+      "requires": {
+        "babel-plugin-istanbul": "5.1.1",
+        "babel-preset-jest": "24.1.0",
+        "chalk": "2.4.2",
+        "slash": "2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.3"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.5.0"
+          }
+        },
+        "slash": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "babel-loader": {
+      "version": "7.1.5",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.5.tgz",
+      "integrity": "sha512-iCHfbieL5d1LfOQeeVJEUyD9rTwBcP/fcEbRCfempxTDuqrKpu0AZjLAQHEQa3Yqyj9ORKe2iHfoj4rHLf7xpw==",
+      "dev": true,
+      "requires": {
+        "find-cache-dir": "1.0.0",
+        "loader-utils": "1.2.3",
+        "mkdirp": "0.5.1"
+      },
+      "dependencies": {
+        "find-cache-dir": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
+          "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
+          "dev": true,
+          "requires": {
+            "commondir": "1.0.1",
+            "make-dir": "1.3.0",
+            "pkg-dir": "2.0.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "2.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "2.0.0",
+            "path-exists": "3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "1.3.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+          "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+          "dev": true,
+          "requires": {
+            "find-up": "2.1.0"
+          }
+        }
+      }
+    },
+    "babel-messages": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-check-es2015-constants": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
+      "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-istanbul": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.1.tgz",
+      "integrity": "sha512-RNNVv2lsHAXJQsEJ5jonQwrJVWK8AcZpG1oxhnjCUaAjL7xahYLANhPUZbzEQHjKy1NMYUwn+0NPKQc8iSY4xQ==",
+      "dev": true,
+      "requires": {
+        "find-up": "3.0.0",
+        "istanbul-lib-instrument": "3.1.0",
+        "test-exclude": "5.1.0"
+      }
+    },
+    "babel-plugin-jest-hoist": {
+      "version": "24.1.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.1.0.tgz",
+      "integrity": "sha512-gljYrZz8w1b6fJzKcsfKsipSru2DU2DmQ39aB6nV3xQ0DDv3zpIzKGortA5gknrhNnPN8DweaEgrnZdmbGmhnw==",
+      "dev": true
+    },
+    "babel-plugin-react-transform": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-react-transform/-/babel-plugin-react-transform-2.0.2.tgz",
+      "integrity": "sha1-UVu/qZaJOYEULZCx+bFjXeKZUQk=",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.11"
+      }
+    },
+    "babel-plugin-syntax-async-functions": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
+      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
+      "dev": true
+    },
+    "babel-plugin-syntax-async-generators": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
+      "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
+      "dev": true
+    },
+    "babel-plugin-syntax-class-properties": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
+      "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
+      "dev": true
+    },
+    "babel-plugin-syntax-decorators": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
+      "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
+      "dev": true
+    },
+    "babel-plugin-syntax-dynamic-import": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
+      "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
+      "dev": true
+    },
+    "babel-plugin-syntax-exponentiation-operator": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
+      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
+      "dev": true
+    },
+    "babel-plugin-syntax-flow": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
+      "integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=",
+      "dev": true
+    },
+    "babel-plugin-syntax-jsx": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
+      "dev": true
+    },
+    "babel-plugin-syntax-object-rest-spread": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
+      "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
+      "dev": true
+    },
+    "babel-plugin-syntax-trailing-function-commas": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
+      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
+      "dev": true
+    },
+    "babel-plugin-transform-async-generator-functions": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
+      "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
+      "dev": true,
+      "requires": {
+        "babel-helper-remap-async-to-generator": "6.24.1",
+        "babel-plugin-syntax-async-generators": "6.13.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-async-to-generator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
+      "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
+      "dev": true,
+      "requires": {
+        "babel-helper-remap-async-to-generator": "6.24.1",
+        "babel-plugin-syntax-async-functions": "6.13.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-class-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz",
+      "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-plugin-syntax-class-properties": "6.13.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-decorators": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",
+      "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
+      "dev": true,
+      "requires": {
+        "babel-helper-explode-class": "6.24.1",
+        "babel-plugin-syntax-decorators": "6.13.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-arrow-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
+      "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-block-scoped-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
+      "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-block-scoping": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
+      "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "lodash": "4.17.11"
+      }
+    },
+    "babel-plugin-transform-es2015-classes": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
+      "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
+      "dev": true,
+      "requires": {
+        "babel-helper-define-map": "6.26.0",
+        "babel-helper-function-name": "6.24.1",
+        "babel-helper-optimise-call-expression": "6.24.1",
+        "babel-helper-replace-supers": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-computed-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
+      "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-destructuring": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
+      "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-duplicate-keys": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
+      "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-for-of": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
+      "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
+      "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
+      "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-amd": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
+      "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-es2015-modules-commonjs": "6.26.2",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-commonjs": {
+      "version": "6.26.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz",
+      "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-strict-mode": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-systemjs": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
+      "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
+      "dev": true,
+      "requires": {
+        "babel-helper-hoist-variables": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-umd": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
+      "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-object-super": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
+      "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
+      "dev": true,
+      "requires": {
+        "babel-helper-replace-supers": "6.24.1",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-parameters": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
+      "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
+      "dev": true,
+      "requires": {
+        "babel-helper-call-delegate": "6.24.1",
+        "babel-helper-get-function-arity": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-shorthand-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
+      "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-spread": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
+      "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-sticky-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
+      "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-template-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
+      "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-typeof-symbol": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
+      "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-unicode-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
+      "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "regexpu-core": "2.0.0"
+      }
+    },
+    "babel-plugin-transform-exponentiation-operator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
+      "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
+      "dev": true,
+      "requires": {
+        "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
+        "babel-plugin-syntax-exponentiation-operator": "6.13.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-flow-strip-types": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz",
+      "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-flow": "6.18.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-object-rest-spread": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz",
+      "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-object-rest-spread": "6.13.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-react-constant-elements": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-constant-elements/-/babel-plugin-transform-react-constant-elements-6.23.0.tgz",
+      "integrity": "sha1-LxGb9NLN1F65uqrldAU8YE9hR90=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-react-display-name": {
+      "version": "6.25.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz",
+      "integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-react-jsx": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz",
+      "integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
+      "dev": true,
+      "requires": {
+        "babel-helper-builder-react-jsx": "6.26.0",
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-react-jsx-self": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz",
+      "integrity": "sha1-322AqdomEqEh5t3XVYvL7PBuY24=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-react-jsx-source": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz",
+      "integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-react-remove-prop-types": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz",
+      "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==",
+      "dev": true
+    },
+    "babel-plugin-transform-regenerator": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
+      "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "0.10.1"
+      }
+    },
+    "babel-plugin-transform-strict-mode": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
+      "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-polyfill": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
+      "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "core-js": "2.6.5",
+        "regenerator-runtime": "0.10.5"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.10.5",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
+          "dev": true
+        }
+      }
+    },
+    "babel-preset-env": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz",
+      "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==",
+      "dev": true,
+      "requires": {
+        "babel-plugin-check-es2015-constants": "6.22.0",
+        "babel-plugin-syntax-trailing-function-commas": "6.22.0",
+        "babel-plugin-transform-async-to-generator": "6.24.1",
+        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "6.26.0",
+        "babel-plugin-transform-es2015-classes": "6.24.1",
+        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "6.23.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
+        "babel-plugin-transform-es2015-for-of": "6.23.0",
+        "babel-plugin-transform-es2015-function-name": "6.24.1",
+        "babel-plugin-transform-es2015-literals": "6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+        "babel-plugin-transform-es2015-modules-commonjs": "6.26.2",
+        "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
+        "babel-plugin-transform-es2015-modules-umd": "6.24.1",
+        "babel-plugin-transform-es2015-object-super": "6.24.1",
+        "babel-plugin-transform-es2015-parameters": "6.24.1",
+        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
+        "babel-plugin-transform-es2015-spread": "6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
+        "babel-plugin-transform-es2015-template-literals": "6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
+        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
+        "babel-plugin-transform-exponentiation-operator": "6.24.1",
+        "babel-plugin-transform-regenerator": "6.26.0",
+        "browserslist": "3.2.8",
+        "invariant": "2.2.4",
+        "semver": "5.6.0"
+      }
+    },
+    "babel-preset-flow": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz",
+      "integrity": "sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-flow-strip-types": "6.22.0"
+      }
+    },
+    "babel-preset-jest": {
+      "version": "24.1.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.1.0.tgz",
+      "integrity": "sha512-FfNLDxFWsNX9lUmtwY7NheGlANnagvxq8LZdl5PKnVG3umP+S/g0XbVBfwtA4Ai3Ri/IMkWabBz3Tyk9wdspcw==",
+      "dev": true,
+      "requires": {
+        "@babel/plugin-syntax-object-rest-spread": "7.2.0",
+        "babel-plugin-jest-hoist": "24.1.0"
+      }
+    },
+    "babel-preset-react": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.24.1.tgz",
+      "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-plugin-transform-react-display-name": "6.25.0",
+        "babel-plugin-transform-react-jsx": "6.24.1",
+        "babel-plugin-transform-react-jsx-self": "6.22.0",
+        "babel-plugin-transform-react-jsx-source": "6.22.0",
+        "babel-preset-flow": "6.23.0"
+      }
+    },
+    "babel-preset-react-hmre": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-react-hmre/-/babel-preset-react-hmre-1.1.1.tgz",
+      "integrity": "sha1-0hbmDLW41Mhz4Z7Q9U6v8UN7xJI=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-react-transform": "2.0.2",
+        "react-transform-catch-errors": "1.0.2",
+        "react-transform-hmr": "1.0.4",
+        "redbox-react": "1.6.0"
+      }
+    },
+    "babel-preset-stage-2": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
+      "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-dynamic-import": "6.18.0",
+        "babel-plugin-transform-class-properties": "6.24.1",
+        "babel-plugin-transform-decorators": "6.24.1",
+        "babel-preset-stage-3": "6.24.1"
+      }
+    },
+    "babel-preset-stage-3": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz",
+      "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-trailing-function-commas": "6.22.0",
+        "babel-plugin-transform-async-generator-functions": "6.24.1",
+        "babel-plugin-transform-async-to-generator": "6.24.1",
+        "babel-plugin-transform-exponentiation-operator": "6.24.1",
+        "babel-plugin-transform-object-rest-spread": "6.26.0"
+      }
+    },
+    "babel-register": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
+      "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
+      "requires": {
+        "babel-core": "6.26.3",
+        "babel-runtime": "6.26.0",
+        "core-js": "2.6.5",
+        "home-or-tmp": "2.0.0",
+        "lodash": "4.17.11",
+        "mkdirp": "0.5.1",
+        "source-map-support": "0.4.18"
+      }
+    },
+    "babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "requires": {
+        "core-js": "2.6.5",
+        "regenerator-runtime": "0.11.1"
+      }
+    },
+    "babel-template": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "lodash": "4.17.11"
+      }
+    },
+    "babel-traverse": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
+      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+      "requires": {
+        "babel-code-frame": "6.26.0",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "debug": "2.6.9",
+        "globals": "9.18.0",
+        "invariant": "2.2.4",
+        "lodash": "4.17.11"
+      }
+    },
+    "babel-types": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "esutils": "2.0.2",
+        "lodash": "4.17.11",
+        "to-fast-properties": "1.0.3"
+      }
+    },
+    "babylon": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "requires": {
+        "cache-base": "1.0.1",
+        "class-utils": "0.3.6",
+        "component-emitter": "1.2.1",
+        "define-property": "1.0.0",
+        "isobject": "3.0.1",
+        "mixin-deep": "1.3.1",
+        "pascalcase": "0.1.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.2"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
+      }
+    },
+    "base64-js": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
+      "dev": true
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "dev": true,
+      "requires": {
+        "tweetnacl": "0.14.5"
+      }
+    },
+    "big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true
+    },
+    "binary-extensions": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.0.tgz",
+      "integrity": "sha512-EgmjVLMn22z7eGGv3kcnHwSnJXmFHjISTY9E/S5lIcTD3Oxw05QTcBLNkJFzcb3cNueUdF/IN4U+d78V0zO8Hw==",
+      "dev": true
+    },
+    "block-stream": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "bluebird": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
+      "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==",
+      "dev": true
+    },
+    "bn.js": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "dev": true
+    },
+    "boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "expand-range": "1.8.2",
+        "preserve": "0.2.0",
+        "repeat-element": "1.1.3"
+      }
+    },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "requires": {
+        "buffer-xor": "1.0.3",
+        "cipher-base": "1.0.4",
+        "create-hash": "1.2.0",
+        "evp_bytestokey": "1.0.3",
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "requires": {
+        "browserify-aes": "1.2.0",
+        "browserify-des": "1.0.2",
+        "evp_bytestokey": "1.0.3"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "1.0.4",
+        "des.js": "1.0.0",
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "randombytes": "2.1.0"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "elliptic": "6.4.1",
+        "inherits": "2.0.3",
+        "parse-asn1": "5.1.4"
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "requires": {
+        "pako": "1.0.8"
+      }
+    },
+    "browserslist": {
+      "version": "3.2.8",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz",
+      "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "1.0.30000939",
+        "electron-to-chromium": "1.3.113"
+      }
+    },
+    "buffer": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "dev": true,
+      "requires": {
+        "base64-js": "1.3.0",
+        "ieee754": "1.1.12",
+        "isarray": "1.0.0"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "cacache": {
+      "version": "11.3.2",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+      "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
+      "dev": true,
+      "requires": {
+        "bluebird": "3.5.3",
+        "chownr": "1.1.1",
+        "figgy-pudding": "3.5.1",
+        "glob": "7.1.3",
+        "graceful-fs": "4.1.15",
+        "lru-cache": "5.1.1",
+        "mississippi": "3.0.0",
+        "mkdirp": "0.5.1",
+        "move-concurrently": "1.0.1",
+        "promise-inflight": "1.0.1",
+        "rimraf": "2.6.3",
+        "ssri": "6.0.1",
+        "unique-filename": "1.1.1",
+        "y18n": "4.0.0"
+      }
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "requires": {
+        "collection-visit": "1.0.0",
+        "component-emitter": "1.2.1",
+        "get-value": "2.0.6",
+        "has-value": "1.0.0",
+        "isobject": "3.0.1",
+        "set-value": "2.0.0",
+        "to-object-path": "0.3.0",
+        "union-value": "1.0.0",
+        "unset-value": "1.0.0"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
+      }
+    },
+    "caller-callsite": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
+      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
+      "dev": true,
+      "requires": {
+        "callsites": "2.0.0"
+      },
+      "dependencies": {
+        "callsites": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+          "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+          "dev": true
+        }
+      }
+    },
+    "caller-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
+      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+      "dev": true,
+      "requires": {
+        "caller-callsite": "2.0.0"
+      }
+    },
+    "callsites": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.0.0.tgz",
+      "integrity": "sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw==",
+      "dev": true
+    },
+    "camel-case": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
+      "dev": true,
+      "requires": {
+        "no-case": "2.3.2",
+        "upper-case": "1.1.3"
+      }
+    },
+    "camelcase": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+      "dev": true
+    },
+    "camelcase-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+      "dev": true,
+      "requires": {
+        "camelcase": "2.1.1",
+        "map-obj": "1.0.1"
+      }
+    },
+    "caniuse-lite": {
+      "version": "1.0.30000939",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000939.tgz",
+      "integrity": "sha512-oXB23ImDJOgQpGjRv1tCtzAvJr4/OvrHi5SO2vUgB0g0xpdZZoA/BxfImiWfdwoYdUTtQrPsXsvYU/dmCSM8gg==",
+      "dev": true
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "3.2.1",
+        "escape-string-regexp": "1.0.5",
+        "supports-color": "5.5.0"
+      }
+    },
+    "chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "dev": true
+    },
+    "charenc": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
+      "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=",
+      "dev": true
+    },
+    "chokidar": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
+      "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "anymatch": "1.3.2",
+        "async-each": "1.0.1",
+        "fsevents": "1.2.7",
+        "glob-parent": "2.0.0",
+        "inherits": "2.0.3",
+        "is-binary-path": "1.0.1",
+        "is-glob": "2.0.1",
+        "path-is-absolute": "1.0.1",
+        "readdirp": "2.2.1"
+      }
+    },
+    "chownr": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
+      "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
+      "dev": true
+    },
+    "chrome-trace-event": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz",
+      "integrity": "sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==",
+      "dev": true,
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
+    "ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "dev": true
+    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "3.1.0",
+        "define-property": "0.2.5",
+        "isobject": "3.0.1",
+        "static-extend": "0.1.2"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "0.1.6"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
+      }
+    },
+    "clean-css": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
+      "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
+      "dev": true,
+      "requires": {
+        "source-map": "0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "2.0.0"
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+      "dev": true
+    },
+    "cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "dev": true,
+      "requires": {
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wrap-ansi": "2.1.0"
+      },
+      "dependencies": {
+        "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.1"
+          }
+        },
+        "string-width": {
+          "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.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        }
+      }
+    },
+    "clone-deep": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
+      "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
+      "dev": true,
+      "requires": {
+        "for-own": "1.0.0",
+        "is-plain-object": "2.0.4",
+        "kind-of": "6.0.2",
+        "shallow-clone": "1.0.0"
+      },
+      "dependencies": {
+        "for-own": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+          "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+          "dev": true,
+          "requires": {
+            "for-in": "1.0.2"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
+      }
+    },
+    "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
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "dev": true,
+      "requires": {
+        "map-visit": "1.0.0",
+        "object-visit": "1.0.1"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "combined-stream": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
+      "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+      "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
+      "dev": true
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
+    "component-emitter": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "1.1.1",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6",
+        "typedarray": "0.0.6"
+      }
+    },
+    "console-browserify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+      "dev": true,
+      "requires": {
+        "date-now": "0.1.4"
+      }
+    },
+    "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
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
+    },
+    "contains-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
+      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
+      "dev": true
+    },
+    "convert-source-map": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
+      "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "copy-concurrently": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "dev": true,
+      "requires": {
+        "aproba": "1.2.0",
+        "fs-write-stream-atomic": "1.0.10",
+        "iferr": "0.1.5",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.3",
+        "run-queue": "1.0.3"
+      }
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true
+    },
+    "copy-webpack-plugin": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.0.0.tgz",
+      "integrity": "sha512-iiDj+8nnZeW/i8vYJ3+ABSZkOefJnDYIGLojiZKKFDvf1wcEInABXH1+hN7axQMn04qvJxKjgVOee0e14XPtCg==",
+      "dev": true,
+      "requires": {
+        "cacache": "11.3.2",
+        "find-cache-dir": "2.0.0",
+        "globby": "7.1.1",
+        "is-glob": "4.0.0",
+        "loader-utils": "1.2.3",
+        "minimatch": "3.0.4",
+        "normalize-path": "3.0.0",
+        "p-limit": "2.1.0",
+        "serialize-javascript": "1.6.1",
+        "webpack-log": "2.0.0"
+      },
+      "dependencies": {
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
+          "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "2.1.1"
+          }
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        }
+      }
+    },
+    "core-js": {
+      "version": "2.6.5",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
+      "integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A=="
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "cosmiconfig": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
+      "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
+      "dev": true,
+      "requires": {
+        "is-directory": "0.3.1",
+        "js-yaml": "3.12.1",
+        "parse-json": "4.0.0",
+        "require-from-string": "2.0.2"
+      }
+    },
+    "create-ecdh": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "elliptic": "6.4.1"
+      }
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "1.0.4",
+        "inherits": "2.0.3",
+        "md5.js": "1.3.5",
+        "ripemd160": "2.0.2",
+        "sha.js": "2.4.11"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "1.0.4",
+        "create-hash": "1.2.0",
+        "inherits": "2.0.3",
+        "ripemd160": "2.0.2",
+        "safe-buffer": "5.1.2",
+        "sha.js": "2.4.11"
+      }
+    },
+    "cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "requires": {
+        "nice-try": "1.0.5",
+        "path-key": "2.0.1",
+        "semver": "5.6.0",
+        "shebang-command": "1.2.0",
+        "which": "1.3.1"
+      }
+    },
+    "crypt": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+      "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=",
+      "dev": true
+    },
+    "crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "requires": {
+        "browserify-cipher": "1.0.1",
+        "browserify-sign": "4.0.4",
+        "create-ecdh": "4.0.3",
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "diffie-hellman": "5.0.3",
+        "inherits": "2.0.3",
+        "pbkdf2": "3.0.17",
+        "public-encrypt": "4.0.3",
+        "randombytes": "2.1.0",
+        "randomfill": "1.0.4"
+      }
+    },
+    "css-loader": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-2.1.0.tgz",
+      "integrity": "sha512-MoOu+CStsGrSt5K2OeZ89q3Snf+IkxRfAIt9aAKg4piioTrhtP1iEFPu+OVn3Ohz24FO6L+rw9UJxBILiSBw5Q==",
+      "dev": true,
+      "requires": {
+        "icss-utils": "4.1.0",
+        "loader-utils": "1.2.3",
+        "lodash": "4.17.11",
+        "postcss": "7.0.14",
+        "postcss-modules-extract-imports": "2.0.0",
+        "postcss-modules-local-by-default": "2.0.6",
+        "postcss-modules-scope": "2.1.0",
+        "postcss-modules-values": "2.0.0",
+        "postcss-value-parser": "3.3.1",
+        "schema-utils": "1.0.0"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.9.2",
+            "ajv-errors": "1.0.1",
+            "ajv-keywords": "3.4.0"
+          }
+        }
+      }
+    },
+    "css-select": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+      "dev": true,
+      "requires": {
+        "boolbase": "1.0.0",
+        "css-what": "2.1.3",
+        "domutils": "1.5.1",
+        "nth-check": "1.0.2"
+      }
+    },
+    "css-what": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
+      "dev": true
+    },
+    "cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true
+    },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "dev": true,
+      "requires": {
+        "array-find-index": "1.0.2"
+      }
+    },
+    "cyclist": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
+      "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
+      "dev": true
+    },
+    "damerau-levenshtein": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz",
+      "integrity": "sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=",
+      "dev": true
+    },
+    "dashdash": {
+      "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"
+      }
+    },
+    "date-now": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
+      "dev": true
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "requires": {
+        "object-keys": "1.1.0"
+      }
+    },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "requires": {
+        "is-descriptor": "1.0.2",
+        "isobject": "3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
+      }
+    },
+    "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
+    },
+    "delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+      "dev": true
+    },
+    "des.js": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
+      }
+    },
+    "detect-file": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+      "dev": true
+    },
+    "detect-indent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+      "requires": {
+        "repeating": "2.0.1"
+      }
+    },
+    "diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "miller-rabin": "4.0.1",
+        "randombytes": "2.1.0"
+      }
+    },
+    "dir-glob": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
+      "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
+      "dev": true,
+      "requires": {
+        "path-type": "3.0.0"
+      }
+    },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "requires": {
+        "esutils": "2.0.2"
+      }
+    },
+    "dom-converter": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
+      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
+      "dev": true,
+      "requires": {
+        "utila": "0.4.0"
+      }
+    },
+    "dom-serializer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1.3.1",
+        "entities": "1.1.2"
+      }
+    },
+    "dom-walk": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz",
+      "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=",
+      "dev": true
+    },
+    "domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "dev": true
+    },
+    "domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+      "dev": true
+    },
+    "domhandler": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1.3.1"
+      }
+    },
+    "domutils": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+      "dev": true,
+      "requires": {
+        "dom-serializer": "0.1.1",
+        "domelementtype": "1.3.1"
+      }
+    },
+    "duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "1.4.1",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6",
+        "stream-shift": "1.0.0"
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "dev": true,
+      "requires": {
+        "jsbn": "0.1.1",
+        "safer-buffer": "2.1.2"
+      }
+    },
+    "electron-to-chromium": {
+      "version": "1.3.113",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz",
+      "integrity": "sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g==",
+      "dev": true
+    },
+    "elliptic": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
+      "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "brorand": "1.1.0",
+        "hash.js": "1.1.7",
+        "hmac-drbg": "1.0.1",
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1",
+        "minimalistic-crypto-utils": "1.0.1"
+      }
+    },
+    "emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true
+    },
+    "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"
+      }
+    },
+    "enhanced-resolve": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
+      "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.15",
+        "memory-fs": "0.4.1",
+        "tapable": "1.1.1"
+      }
+    },
+    "entities": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+      "dev": true
+    },
+    "errno": {
+      "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"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "0.2.1"
+      }
+    },
+    "error-stack-parser": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-1.3.6.tgz",
+      "integrity": "sha1-4Oc7k+QXE40c18C3RrGkoUhUwpI=",
+      "dev": true,
+      "requires": {
+        "stackframe": "0.3.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
+      "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
+      "dev": true,
+      "requires": {
+        "es-to-primitive": "1.2.0",
+        "function-bind": "1.1.1",
+        "has": "1.0.3",
+        "is-callable": "1.1.4",
+        "is-regex": "1.0.4",
+        "object-keys": "1.1.0"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
+      "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+      "dev": true,
+      "requires": {
+        "is-callable": "1.1.4",
+        "is-date-object": "1.0.1",
+        "is-symbol": "1.0.2"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+    },
+    "eslint": {
+      "version": "5.14.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.14.1.tgz",
+      "integrity": "sha512-CyUMbmsjxedx8B0mr79mNOqetvkbij/zrXnFeK2zc3pGRn3/tibjiNAv/3UxFEyfMDjh+ZqTrJrEGBFiGfD5Og==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "7.0.0",
+        "ajv": "6.9.2",
+        "chalk": "2.4.2",
+        "cross-spawn": "6.0.5",
+        "debug": "4.1.1",
+        "doctrine": "3.0.0",
+        "eslint-scope": "4.0.0",
+        "eslint-utils": "1.3.1",
+        "eslint-visitor-keys": "1.0.0",
+        "espree": "5.0.1",
+        "esquery": "1.0.1",
+        "esutils": "2.0.2",
+        "file-entry-cache": "5.0.1",
+        "functional-red-black-tree": "1.0.1",
+        "glob": "7.1.3",
+        "globals": "11.11.0",
+        "ignore": "4.0.6",
+        "import-fresh": "3.0.0",
+        "imurmurhash": "0.1.4",
+        "inquirer": "6.2.2",
+        "js-yaml": "3.12.1",
+        "json-stable-stringify-without-jsonify": "1.0.1",
+        "levn": "0.3.0",
+        "lodash": "4.17.11",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "natural-compare": "1.4.0",
+        "optionator": "0.8.2",
+        "path-is-inside": "1.0.2",
+        "progress": "2.0.3",
+        "regexpp": "2.0.1",
+        "semver": "5.6.0",
+        "strip-ansi": "4.0.0",
+        "strip-json-comments": "2.0.1",
+        "table": "5.2.3",
+        "text-table": "0.2.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.3"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.5.0"
+          }
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.1"
+          }
+        },
+        "eslint-scope": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
+          "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "4.2.1",
+            "estraverse": "4.2.0"
+          }
+        },
+        "globals": {
+          "version": "11.11.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.11.0.tgz",
+          "integrity": "sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "eslint-config-airbnb": {
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-17.1.0.tgz",
+      "integrity": "sha512-R9jw28hFfEQnpPau01NO5K/JWMGLi6aymiF6RsnMURjTk+MqZKllCqGK/0tOvHkPi/NWSSOU2Ced/GX++YxLnw==",
+      "dev": true,
+      "requires": {
+        "eslint-config-airbnb-base": "13.1.0",
+        "object.assign": "4.1.0",
+        "object.entries": "1.1.0"
+      }
+    },
+    "eslint-config-airbnb-base": {
+      "version": "13.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.1.0.tgz",
+      "integrity": "sha512-XWwQtf3U3zIoKO1BbHh6aUhJZQweOwSt4c2JrPDg9FP3Ltv3+YfEv7jIDB8275tVnO/qOHbfuYg3kzw6Je7uWw==",
+      "dev": true,
+      "requires": {
+        "eslint-restricted-globals": "0.1.1",
+        "object.assign": "4.1.0",
+        "object.entries": "1.1.0"
+      }
+    },
+    "eslint-import-resolver-node": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz",
+      "integrity": "sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "resolve": "1.10.0"
+      }
+    },
+    "eslint-module-utils": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.3.0.tgz",
+      "integrity": "sha512-lmDJgeOOjk8hObTysjqH7wyMi+nsHwwvfBykwfhjR1LNdd7C2uFJBvx4OpWYpXOw4df1yE1cDEVd1yLHitk34w==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "pkg-dir": "2.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "2.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "2.0.0",
+            "path-exists": "3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "1.3.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+          "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+          "dev": true,
+          "requires": {
+            "find-up": "2.1.0"
+          }
+        }
+      }
+    },
+    "eslint-plugin-babel": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-babel/-/eslint-plugin-babel-5.3.0.tgz",
+      "integrity": "sha512-HPuNzSPE75O+SnxHIafbW5QB45r2w78fxqwK3HmjqIUoPfPzVrq6rD+CINU3yzoDSzEhUkX07VUphbF73Lth/w==",
+      "dev": true,
+      "requires": {
+        "eslint-rule-composer": "0.3.0"
+      }
+    },
+    "eslint-plugin-import": {
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.16.0.tgz",
+      "integrity": "sha512-z6oqWlf1x5GkHIFgrSvtmudnqM6Q60KM4KvpWi5ubonMjycLjndvd5+8VAZIsTlHC03djdgJuyKG6XO577px6A==",
+      "dev": true,
+      "requires": {
+        "contains-path": "0.1.0",
+        "debug": "2.6.9",
+        "doctrine": "1.5.0",
+        "eslint-import-resolver-node": "0.3.2",
+        "eslint-module-utils": "2.3.0",
+        "has": "1.0.3",
+        "lodash": "4.17.11",
+        "minimatch": "3.0.4",
+        "read-pkg-up": "2.0.0",
+        "resolve": "1.10.0"
+      },
+      "dependencies": {
+        "doctrine": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+          "dev": true,
+          "requires": {
+            "esutils": "2.0.2",
+            "isarray": "1.0.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "2.0.0"
+          }
+        },
+        "load-json-file": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.15",
+            "parse-json": "2.2.0",
+            "pify": "2.3.0",
+            "strip-bom": "3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "2.0.0",
+            "path-exists": "3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "1.3.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
+        "parse-json": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+          "dev": true,
+          "requires": {
+            "error-ex": "1.3.2"
+          }
+        },
+        "path-type": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "dev": true,
+          "requires": {
+            "pify": "2.3.0"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "2.0.0",
+            "normalize-package-data": "2.5.0",
+            "path-type": "2.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+          "dev": true,
+          "requires": {
+            "find-up": "2.1.0",
+            "read-pkg": "2.0.0"
+          }
+        }
+      }
+    },
+    "eslint-plugin-jsx-a11y": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.1.tgz",
+      "integrity": "sha512-cjN2ObWrRz0TTw7vEcGQrx+YltMvZoOEx4hWU8eEERDnBIU00OTq7Vr+jA7DFKxiwLNv4tTh5Pq2GUNEa8b6+w==",
+      "dev": true,
+      "requires": {
+        "aria-query": "3.0.0",
+        "array-includes": "3.0.3",
+        "ast-types-flow": "0.0.7",
+        "axobject-query": "2.0.2",
+        "damerau-levenshtein": "1.0.4",
+        "emoji-regex": "7.0.3",
+        "has": "1.0.3",
+        "jsx-ast-utils": "2.0.1"
+      }
+    },
+    "eslint-plugin-react": {
+      "version": "7.12.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.12.4.tgz",
+      "integrity": "sha512-1puHJkXJY+oS1t467MjbqjvX53uQ05HXwjqDgdbGBqf5j9eeydI54G3KwiJmWciQ0HTBacIKw2jgwSBSH3yfgQ==",
+      "dev": true,
+      "requires": {
+        "array-includes": "3.0.3",
+        "doctrine": "2.1.0",
+        "has": "1.0.3",
+        "jsx-ast-utils": "2.0.1",
+        "object.fromentries": "2.0.0",
+        "prop-types": "15.7.2",
+        "resolve": "1.10.0"
+      },
+      "dependencies": {
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "dev": true,
+          "requires": {
+            "esutils": "2.0.2"
+          }
+        }
+      }
+    },
+    "eslint-restricted-globals": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz",
+      "integrity": "sha1-NfDVy8ZMLj7WLpO0saevBbp+1Nc=",
+      "dev": true
+    },
+    "eslint-rule-composer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz",
+      "integrity": "sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==",
+      "dev": true
+    },
+    "eslint-scope": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
+      "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
+      "dev": true,
+      "requires": {
+        "esrecurse": "4.2.1",
+        "estraverse": "4.2.0"
+      }
+    },
+    "eslint-utils": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
+      "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
+      "dev": true
+    },
+    "eslint-visitor-keys": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
+      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
+      "dev": true
+    },
+    "eslint-watch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/eslint-watch/-/eslint-watch-4.0.2.tgz",
+      "integrity": "sha512-kbso5+pd6tIwmnTidQfEQ5nRydYw4+8I+8h19yIG/RWcRi8H4TCLlBHwAFBDAmLE4dTkPkctpQQSP8x1nMyYqw==",
+      "dev": true,
+      "requires": {
+        "@babel/polyfill": "7.2.5",
+        "bluebird": "3.5.3",
+        "chalk": "2.4.2",
+        "chokidar": "2.1.2",
+        "debug": "3.2.6",
+        "keypress": "0.2.1",
+        "lodash": "4.17.11",
+        "optionator": "0.8.2",
+        "source-map-support": "0.5.10",
+        "strip-ansi": "4.0.0",
+        "text-table": "0.2.0",
+        "unicons": "0.0.3"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.3"
+          }
+        },
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "requires": {
+            "micromatch": "3.1.10",
+            "normalize-path": "2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "dev": true,
+              "requires": {
+                "remove-trailing-separator": "1.1.0"
+              }
+            }
+          }
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+          "dev": true
+        },
+        "braces": {
+          "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",
+            "extend-shallow": "2.0.1",
+            "fill-range": "4.0.0",
+            "isobject": "3.0.1",
+            "repeat-element": "1.1.3",
+            "snapdragon": "0.8.2",
+            "snapdragon-node": "2.1.1",
+            "split-string": "3.1.0",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.5.0"
+          }
+        },
+        "chokidar": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.2.tgz",
+          "integrity": "sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==",
+          "dev": true,
+          "requires": {
+            "anymatch": "2.0.0",
+            "async-each": "1.0.1",
+            "braces": "2.3.2",
+            "fsevents": "1.2.7",
+            "glob-parent": "3.1.0",
+            "inherits": "2.0.3",
+            "is-binary-path": "1.0.1",
+            "is-glob": "4.0.0",
+            "normalize-path": "3.0.0",
+            "path-is-absolute": "1.0.1",
+            "readdirp": "2.2.1",
+            "upath": "1.1.0"
+          }
+        },
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.1"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+              "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+              "dev": true
+            }
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "define-property": "0.2.5",
+            "extend-shallow": "2.0.1",
+            "posix-character-classes": "0.1.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "dev": true,
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "0.1.6"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            },
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+              "dev": true,
+              "requires": {
+                "kind-of": "3.2.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.6"
+                  }
+                }
+              }
+            },
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+              "dev": true,
+              "requires": {
+                "kind-of": "3.2.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.6"
+                  }
+                }
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "0.1.6",
+                "is-data-descriptor": "0.1.4",
+                "kind-of": "5.1.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+              "dev": true
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "0.3.2",
+            "define-property": "1.0.0",
+            "expand-brackets": "2.1.4",
+            "extend-shallow": "2.0.1",
+            "fragment-cache": "0.2.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
+          },
+          "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.2"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "2.0.1",
+            "is-number": "3.0.0",
+            "repeat-string": "1.6.1",
+            "to-regex-range": "2.1.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "dev": true,
+          "requires": {
+            "is-glob": "3.1.0",
+            "path-dirname": "1.0.2"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "dev": true,
+              "requires": {
+                "is-extglob": "2.1.1"
+              }
+            }
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
+          "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "2.1.1"
+          }
+        },
+        "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.2.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.6"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "braces": "2.3.2",
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "extglob": "2.0.4",
+            "fragment-cache": "0.2.1",
+            "kind-of": "6.0.2",
+            "nanomatch": "1.2.13",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
+          }
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "source-map-support": {
+          "version": "0.5.10",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz",
+          "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==",
+          "dev": true,
+          "requires": {
+            "buffer-from": "1.1.1",
+            "source-map": "0.6.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "espree": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
+      "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
+      "dev": true,
+      "requires": {
+        "acorn": "6.1.0",
+        "acorn-jsx": "5.0.1",
+        "eslint-visitor-keys": "1.0.0"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "esquery": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "dev": true,
+      "requires": {
+        "estraverse": "4.2.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "dev": true,
+      "requires": {
+        "estraverse": "4.2.0"
+      }
+    },
+    "estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
+    },
+    "events": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
+      "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
+      "dev": true
+    },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "requires": {
+        "md5.js": "1.3.5",
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "6.0.5",
+        "get-stream": "4.1.0",
+        "is-stream": "1.1.0",
+        "npm-run-path": "2.0.2",
+        "p-finally": "1.0.0",
+        "signal-exit": "3.0.2",
+        "strip-eof": "1.0.0"
+      }
+    },
+    "expand-brackets": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "is-posix-bracket": "0.1.1"
+      }
+    },
+    "expand-range": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
+      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "fill-range": "2.2.4"
+      }
+    },
+    "expand-tilde": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+      "dev": true,
+      "requires": {
+        "homedir-polyfill": "1.0.3"
+      }
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
+    },
+    "extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "requires": {
+        "assign-symbols": "1.0.0",
+        "is-extendable": "1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "2.0.4"
+          }
+        }
+      }
+    },
+    "external-editor": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
+      "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
+      "dev": true,
+      "requires": {
+        "chardet": "0.7.0",
+        "iconv-lite": "0.4.24",
+        "tmp": "0.0.33"
+      }
+    },
+    "extglob": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "is-extglob": "1.0.0"
+      }
+    },
+    "extract-text-webpack-plugin": {
+      "version": "4.0.0-beta.0",
+      "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-4.0.0-beta.0.tgz",
+      "integrity": "sha512-Hypkn9jUTnFr0DpekNam53X47tXn3ucY08BQumv7kdGgeVUBLq3DJHJTi6HNxv4jl9W+Skxjz9+RnK0sJyqqjA==",
+      "dev": true,
+      "requires": {
+        "async": "2.6.2",
+        "loader-utils": "1.2.3",
+        "schema-utils": "0.4.7",
+        "webpack-sources": "1.3.0"
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true
+    },
+    "fast-deep-equal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "dev": true
+    },
+    "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
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "fastparse": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
+      "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
+      "dev": true
+    },
+    "figgy-pudding": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
+      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
+      "dev": true
+    },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "1.0.5"
+      }
+    },
+    "file-entry-cache": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+      "dev": true,
+      "requires": {
+        "flat-cache": "2.0.1"
+      }
+    },
+    "file-loader": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz",
+      "integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.2.3",
+        "schema-utils": "1.0.0"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.9.2",
+            "ajv-errors": "1.0.1",
+            "ajv-keywords": "3.4.0"
+          }
+        }
+      }
+    },
+    "filename-regex": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
+      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
+      "dev": true,
+      "optional": true
+    },
+    "fill-range": {
+      "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,
+      "optional": true,
+      "requires": {
+        "is-number": "2.1.0",
+        "isobject": "2.1.0",
+        "randomatic": "3.1.1",
+        "repeat-element": "1.1.3",
+        "repeat-string": "1.6.1"
+      }
+    },
+    "find-cache-dir": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz",
+      "integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==",
+      "dev": true,
+      "requires": {
+        "commondir": "1.0.1",
+        "make-dir": "1.3.0",
+        "pkg-dir": "3.0.0"
+      }
+    },
+    "find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "requires": {
+        "locate-path": "3.0.0"
+      }
+    },
+    "findup-sync": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
+      "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
+      "dev": true,
+      "requires": {
+        "detect-file": "1.0.0",
+        "is-glob": "3.1.0",
+        "micromatch": "3.1.10",
+        "resolve-dir": "1.0.1"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+          "dev": true
+        },
+        "braces": {
+          "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",
+            "extend-shallow": "2.0.1",
+            "fill-range": "4.0.0",
+            "isobject": "3.0.1",
+            "repeat-element": "1.1.3",
+            "snapdragon": "0.8.2",
+            "snapdragon-node": "2.1.1",
+            "split-string": "3.1.0",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "define-property": "0.2.5",
+            "extend-shallow": "2.0.1",
+            "posix-character-classes": "0.1.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "0.1.6"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            },
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+              "dev": true,
+              "requires": {
+                "kind-of": "3.2.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.6"
+                  }
+                }
+              }
+            },
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+              "dev": true,
+              "requires": {
+                "kind-of": "3.2.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.6"
+                  }
+                }
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "0.1.6",
+                "is-data-descriptor": "0.1.4",
+                "kind-of": "5.1.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+              "dev": true
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "0.3.2",
+            "define-property": "1.0.0",
+            "expand-brackets": "2.1.4",
+            "extend-shallow": "2.0.1",
+            "fragment-cache": "0.2.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
+          },
+          "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.2"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "2.0.1",
+            "is-number": "3.0.0",
+            "repeat-string": "1.6.1",
+            "to-regex-range": "2.1.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "2.1.1"
+          }
+        },
+        "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.2.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.6"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "braces": "2.3.2",
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "extglob": "2.0.4",
+            "fragment-cache": "0.2.1",
+            "kind-of": "6.0.2",
+            "nanomatch": "1.2.13",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
+          }
+        }
+      }
+    },
+    "flat-cache": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+      "dev": true,
+      "requires": {
+        "flatted": "2.0.0",
+        "rimraf": "2.6.3",
+        "write": "1.0.3"
+      }
+    },
+    "flatted": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.0.tgz",
+      "integrity": "sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==",
+      "dev": true
+    },
+    "flush-write-stream": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "for-own": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "for-in": "1.0.2"
+      }
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dev": true,
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.7",
+        "mime-types": "2.1.22"
+      }
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "dev": true,
+      "requires": {
+        "map-cache": "0.2.2"
+      }
+    },
+    "from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
+      }
+    },
+    "fs-readdir-recursive": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
+      "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==",
+      "dev": true
+    },
+    "fs-write-stream-atomic": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.15",
+        "iferr": "0.1.5",
+        "imurmurhash": "0.1.4",
+        "readable-stream": "2.3.6"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.7.tgz",
+      "integrity": "sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "2.12.1",
+        "node-pre-gyp": "0.10.3"
+      },
+      "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.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "1.0.0",
+            "readable-stream": "2.3.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.1.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.6.0",
+          "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.3.5"
+          }
+        },
+        "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.2.0",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.3"
+          }
+        },
+        "glob": {
+          "version": "7.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "iconv-lite": {
+          "version": "0.4.24",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safer-buffer": "2.1.2"
+          }
+        },
+        "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.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "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.1"
+          }
+        },
+        "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.11"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true
+        },
+        "minipass": {
+          "version": "2.3.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.2",
+            "yallist": "3.0.3"
+          }
+        },
+        "minizlib": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "2.3.5"
+          }
+        },
+        "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.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "2.6.9",
+            "iconv-lite": "0.4.24",
+            "sax": "1.2.4"
+          }
+        },
+        "node-pre-gyp": {
+          "version": "0.10.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "1.0.3",
+            "mkdirp": "0.5.1",
+            "needle": "2.2.4",
+            "nopt": "4.0.1",
+            "npm-packlist": "1.2.0",
+            "npmlog": "4.1.2",
+            "rc": "1.2.8",
+            "rimraf": "2.6.3",
+            "semver": "5.6.0",
+            "tar": "4.4.8"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1.1.1",
+            "osenv": "0.1.5"
+          }
+        },
+        "npm-bundled": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "npm-packlist": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ignore-walk": "3.0.1",
+            "npm-bundled": "1.0.5"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "1.1.5",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "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.0.2"
+          }
+        },
+        "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.2",
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "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.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "0.6.0",
+            "ini": "1.3.5",
+            "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.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.2",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "glob": "7.1.3"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "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.6.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.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "5.1.2"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "4.4.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chownr": "1.1.1",
+            "fs-minipass": "1.2.5",
+            "minipass": "2.3.5",
+            "minizlib": "1.2.1",
+            "mkdirp": "0.5.1",
+            "safe-buffer": "5.1.2",
+            "yallist": "3.0.3"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "wide-align": {
+          "version": "1.1.3",
+          "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.3",
+          "bundled": true,
+          "dev": true
+        }
+      }
+    },
+    "fstream": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.15",
+        "inherits": "2.0.3",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.3"
+      }
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "gauge": {
+      "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.2.0",
+        "console-control-strings": "1.1.0",
+        "has-unicode": "2.0.1",
+        "object-assign": "4.1.1",
+        "signal-exit": "3.0.2",
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wide-align": "1.1.3"
+      },
+      "dependencies": {
+        "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.1"
+          }
+        },
+        "string-width": {
+          "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.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        }
+      }
+    },
+    "gaze": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+      "dev": true,
+      "requires": {
+        "globule": "1.2.1"
+      }
+    },
+    "get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "dev": true
+    },
+    "get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "requires": {
+        "pump": "3.0.0"
+      }
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true
+    },
+    "getpass": {
+      "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"
+      }
+    },
+    "glob": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "1.0.0",
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4",
+        "once": "1.4.0",
+        "path-is-absolute": "1.0.1"
+      }
+    },
+    "glob-base": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "glob-parent": "2.0.0",
+        "is-glob": "2.0.1"
+      }
+    },
+    "glob-parent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+      "dev": true,
+      "requires": {
+        "is-glob": "2.0.1"
+      }
+    },
+    "global": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz",
+      "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
+      "dev": true,
+      "requires": {
+        "min-document": "2.19.0",
+        "process": "0.5.2"
+      }
+    },
+    "global-modules": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "dev": true,
+      "requires": {
+        "global-prefix": "1.0.2",
+        "is-windows": "1.0.2",
+        "resolve-dir": "1.0.1"
+      }
+    },
+    "global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "2.0.2",
+        "homedir-polyfill": "1.0.3",
+        "ini": "1.3.5",
+        "is-windows": "1.0.2",
+        "which": "1.3.1"
+      }
+    },
+    "globals": {
+      "version": "9.18.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="
+    },
+    "globby": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
+      "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
+      "dev": true,
+      "requires": {
+        "array-union": "1.0.2",
+        "dir-glob": "2.2.2",
+        "glob": "7.1.3",
+        "ignore": "3.3.10",
+        "pify": "3.0.0",
+        "slash": "1.0.0"
+      },
+      "dependencies": {
+        "ignore": {
+          "version": "3.3.10",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+          "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+          "dev": true
+        }
+      }
+    },
+    "globule": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
+      "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.3",
+        "lodash": "4.17.11",
+        "minimatch": "3.0.4"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.15",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
+      "dev": true
+    },
+    "handlebars-loader": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/handlebars-loader/-/handlebars-loader-1.7.1.tgz",
+      "integrity": "sha512-Q+Z/hDPQzU8ZTlVnAe/0T1LHABlyhL7opNcSKcQDhmUXK2ByGTqib1Z2Tfv4Ic50WqDcLFWQcOb3mhjcBRbscQ==",
+      "dev": true,
+      "requires": {
+        "async": "0.2.10",
+        "fastparse": "1.1.2",
+        "loader-utils": "1.0.4",
+        "object-assign": "4.1.1"
+      },
+      "dependencies": {
+        "async": {
+          "version": "0.2.10",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+          "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
+          "dev": true
+        },
+        "big.js": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
+          "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
+          "dev": true
+        },
+        "loader-utils": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.0.4.tgz",
+          "integrity": "sha1-E/Vhl/FSOjBYkSSLTHJEVAhIQmw=",
+          "dev": true,
+          "requires": {
+            "big.js": "3.2.0",
+            "emojis-list": "2.1.0",
+            "json5": "0.5.1"
+          }
+        }
+      }
+    },
+    "har-schema": {
+      "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": "5.1.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+      "dev": true,
+      "requires": {
+        "ajv": "6.9.2",
+        "har-schema": "2.0.0"
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "1.1.1"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "requires": {
+        "ansi-regex": "2.1.1"
+      }
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "has-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
+      "dev": true
+    },
+    "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
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
+      "requires": {
+        "get-value": "2.0.6",
+        "has-values": "1.0.0",
+        "isobject": "3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
+      "requires": {
+        "is-number": "3.0.0",
+        "kind-of": "4.0.0"
+      },
+      "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.2.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.6"
+              }
+            }
+          }
+        },
+        "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.6"
+          }
+        }
+      }
+    },
+    "hash-base": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
+      }
+    },
+    "he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "requires": {
+        "hash.js": "1.1.7",
+        "minimalistic-assert": "1.0.1",
+        "minimalistic-crypto-utils": "1.0.1"
+      }
+    },
+    "home-or-tmp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+      "requires": {
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "dev": true,
+      "requires": {
+        "parse-passwd": "1.0.0"
+      }
+    },
+    "hosted-git-info": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
+      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
+      "dev": true
+    },
+    "html-minifier": {
+      "version": "3.5.21",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
+      "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
+      "dev": true,
+      "requires": {
+        "camel-case": "3.0.0",
+        "clean-css": "4.2.1",
+        "commander": "2.17.1",
+        "he": "1.2.0",
+        "param-case": "2.1.1",
+        "relateurl": "0.2.7",
+        "uglify-js": "3.4.9"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.17.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+          "dev": true
+        }
+      }
+    },
+    "html-webpack-plugin": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
+      "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=",
+      "dev": true,
+      "requires": {
+        "html-minifier": "3.5.21",
+        "loader-utils": "0.2.17",
+        "lodash": "4.17.11",
+        "pretty-error": "2.1.1",
+        "tapable": "1.1.1",
+        "toposort": "1.0.7",
+        "util.promisify": "1.0.0"
+      },
+      "dependencies": {
+        "big.js": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
+          "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
+          "dev": true
+        },
+        "loader-utils": {
+          "version": "0.2.17",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
+          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+          "dev": true,
+          "requires": {
+            "big.js": "3.2.0",
+            "emojis-list": "2.1.0",
+            "json5": "0.5.1",
+            "object-assign": "4.1.1"
+          }
+        }
+      }
+    },
+    "htmlparser2": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1.3.1",
+        "domhandler": "2.4.2",
+        "domutils": "1.5.1",
+        "entities": "1.1.2",
+        "inherits": "2.0.3",
+        "readable-stream": "3.1.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
+          "integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
+          }
+        }
+      }
+    },
+    "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.4.1",
+        "sshpk": "1.16.1"
+      }
+    },
+    "https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true
+    },
+    "husky": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-1.3.1.tgz",
+      "integrity": "sha512-86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg==",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "5.1.0",
+        "execa": "1.0.0",
+        "find-up": "3.0.0",
+        "get-stdin": "6.0.0",
+        "is-ci": "2.0.0",
+        "pkg-dir": "3.0.0",
+        "please-upgrade-node": "3.1.1",
+        "read-pkg": "4.0.1",
+        "run-node": "1.0.0",
+        "slash": "2.0.0"
+      },
+      "dependencies": {
+        "cosmiconfig": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.1.0.tgz",
+          "integrity": "sha512-kCNPvthka8gvLtzAxQXvWo4FxqRB+ftRZyPZNuab5ngvM9Y7yw7hbEysglptLgpkGX9nAOKTBVkHUAe8xtYR6Q==",
+          "dev": true,
+          "requires": {
+            "import-fresh": "2.0.0",
+            "is-directory": "0.3.1",
+            "js-yaml": "3.12.1",
+            "lodash.get": "4.4.2",
+            "parse-json": "4.0.0"
+          }
+        },
+        "get-stdin": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz",
+          "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==",
+          "dev": true
+        },
+        "import-fresh": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+          "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+          "dev": true,
+          "requires": {
+            "caller-path": "2.0.0",
+            "resolve-from": "3.0.0"
+          }
+        },
+        "read-pkg": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz",
+          "integrity": "sha1-ljYlN48+HE1IyFhytabsfV0JMjc=",
+          "dev": true,
+          "requires": {
+            "normalize-package-data": "2.5.0",
+            "parse-json": "4.0.0",
+            "pify": "3.0.0"
+          }
+        },
+        "resolve-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+          "dev": true
+        },
+        "slash": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+          "dev": true
+        }
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": "2.1.2"
+      }
+    },
+    "icss-replace-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
+      "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=",
+      "dev": true
+    },
+    "icss-utils": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.0.tgz",
+      "integrity": "sha512-3DEun4VOeMvSczifM3F2cKQrDQ5Pj6WKhkOq6HD4QTnDUAq8MQRxy5TX6Sy1iY6WPBe4gQ3p5vTECjbIkglkkQ==",
+      "dev": true,
+      "requires": {
+        "postcss": "7.0.14"
+      }
+    },
+    "ieee754": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
+      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
+      "dev": true
+    },
+    "iferr": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+      "dev": true
+    },
+    "ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true
+    },
+    "import-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
+      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
+      "dev": true,
+      "requires": {
+        "import-from": "2.1.0"
+      }
+    },
+    "import-fresh": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.0.0.tgz",
+      "integrity": "sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==",
+      "dev": true,
+      "requires": {
+        "parent-module": "1.0.0",
+        "resolve-from": "4.0.0"
+      }
+    },
+    "import-from": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
+      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "3.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+          "dev": true
+        }
+      }
+    },
+    "import-local": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+      "dev": true,
+      "requires": {
+        "pkg-dir": "3.0.0",
+        "resolve-cwd": "2.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "in-publish": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
+      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "dev": true,
+      "requires": {
+        "repeating": "2.0.1"
+      }
+    },
+    "indexes-of": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+      "dev": true
+    },
+    "indexof": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "dev": true
+    },
+    "inquirer": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.2.tgz",
+      "integrity": "sha512-Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA==",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "3.2.0",
+        "chalk": "2.4.2",
+        "cli-cursor": "2.1.0",
+        "cli-width": "2.2.0",
+        "external-editor": "3.0.3",
+        "figures": "2.0.0",
+        "lodash": "4.17.11",
+        "mute-stream": "0.0.7",
+        "run-async": "2.3.0",
+        "rxjs": "6.4.0",
+        "string-width": "2.1.1",
+        "strip-ansi": "5.0.0",
+        "through": "2.3.8"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
+          "integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.3"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.5.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
+          "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "4.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "interpret": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
+      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
+      "dev": true
+    },
+    "invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "requires": {
+        "loose-envify": "1.4.0"
+      }
+    },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "dev": true
+    },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2"
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "1.13.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "is-callable": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+      "dev": true
+    },
+    "is-ci": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "dev": true,
+      "requires": {
+        "ci-info": "2.0.0"
+      }
+    },
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2"
+      }
+    },
+    "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
+    },
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "requires": {
+        "is-accessor-descriptor": "0.1.6",
+        "is-data-descriptor": "0.1.4",
+        "kind-of": "5.1.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+      "dev": true
+    },
+    "is-dotfile": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
+      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
+      "dev": true,
+      "optional": true
+    },
+    "is-equal-shallow": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
+      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "is-primitive": "2.0.0"
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+      "dev": true
+    },
+    "is-finite": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+      "requires": {
+        "number-is-nan": "1.0.1"
+      }
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+      "dev": true,
+      "requires": {
+        "is-extglob": "1.0.0"
+      }
+    },
+    "is-number": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "kind-of": "3.2.2"
+      }
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "requires": {
+        "isobject": "3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
+      }
+    },
+    "is-posix-bracket": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
+      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
+      "dev": true,
+      "optional": true
+    },
+    "is-primitive": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
+      "dev": true,
+      "optional": true
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
+    },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "dev": true,
+      "requires": {
+        "has": "1.0.3"
+      }
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
+    },
+    "is-symbol": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
+      "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "1.0.0"
+      }
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "isarray": "1.0.0"
+      }
+    },
+    "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
+    },
+    "istanbul-lib-coverage": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+      "integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==",
+      "dev": true
+    },
+    "istanbul-lib-instrument": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.1.0.tgz",
+      "integrity": "sha512-ooVllVGT38HIk8MxDj/OIHXSYvH+1tq/Vb38s8ixt9GoJadXska4WkGY+0wkmtYCZNYtaARniH/DixUGGLZ0uA==",
+      "dev": true,
+      "requires": {
+        "@babel/generator": "7.3.3",
+        "@babel/parser": "7.3.3",
+        "@babel/template": "7.2.2",
+        "@babel/traverse": "7.2.3",
+        "@babel/types": "7.3.3",
+        "istanbul-lib-coverage": "2.0.3",
+        "semver": "5.6.0"
+      }
+    },
+    "js-base64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
+      "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==",
+      "dev": true
+    },
+    "js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+    },
+    "js-yaml": {
+      "version": "3.12.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz",
+      "integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==",
+      "dev": true,
+      "requires": {
+        "argparse": "1.0.10",
+        "esprima": "4.0.1"
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true
+    },
+    "jsesc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s="
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "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
+    },
+    "json5": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
+    },
+    "jsprim": {
+      "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",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "jsx-ast-utils": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz",
+      "integrity": "sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=",
+      "dev": true,
+      "requires": {
+        "array-includes": "3.0.3"
+      }
+    },
+    "keypress": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz",
+      "integrity": "sha1-HoBFQlABjbrUw/6USX1uZ7YmnHc=",
+      "dev": true
+    },
+    "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.6"
+      }
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "dev": true,
+      "requires": {
+        "invert-kv": "1.0.0"
+      }
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2"
+      }
+    },
+    "load-json-file": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.15",
+        "parse-json": "4.0.0",
+        "pify": "3.0.0",
+        "strip-bom": "3.0.0"
+      }
+    },
+    "loader-runner": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
+      "dev": true
+    },
+    "loader-utils": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+      "dev": true,
+      "requires": {
+        "big.js": "5.2.2",
+        "emojis-list": "2.1.0",
+        "json5": "1.0.1"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "1.2.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "requires": {
+        "p-locate": "3.0.0",
+        "path-exists": "3.0.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.11",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+    },
+    "lodash.assign": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
+      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
+      "dev": true
+    },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
+    "lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+      "dev": true
+    },
+    "lodash.mergewith": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
+      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
+      "dev": true
+    },
+    "lodash.tail": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
+      "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=",
+      "dev": true
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "requires": {
+        "js-tokens": "3.0.2"
+      }
+    },
+    "loud-rejection": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+      "dev": true,
+      "requires": {
+        "currently-unhandled": "0.4.1",
+        "signal-exit": "3.0.2"
+      }
+    },
+    "lower-case": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "requires": {
+        "yallist": "3.0.3"
+      }
+    },
+    "make-dir": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+      "dev": true,
+      "requires": {
+        "pify": "3.0.0"
+      }
+    },
+    "mamacro": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
+      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
+      "dev": true
+    },
+    "map-age-cleaner": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+      "dev": true,
+      "requires": {
+        "p-defer": "1.0.0"
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true
+    },
+    "map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "dev": true
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
+      "requires": {
+        "object-visit": "1.0.1"
+      }
+    },
+    "math-random": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
+      "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
+      "dev": true,
+      "optional": true
+    },
+    "md5": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz",
+      "integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=",
+      "dev": true,
+      "requires": {
+        "charenc": "0.0.2",
+        "crypt": "0.0.2",
+        "is-buffer": "1.1.6"
+      }
+    },
+    "md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "requires": {
+        "hash-base": "3.0.4",
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "mem": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-4.1.0.tgz",
+      "integrity": "sha512-I5u6Q1x7wxO0kdOpYBB28xueHADYps5uty/zg936CiG8NTe5sJL8EjrCuLneuDW3PlMdZBGDIn8BirEVdovZvg==",
+      "dev": true,
+      "requires": {
+        "map-age-cleaner": "0.1.3",
+        "mimic-fn": "1.2.0",
+        "p-is-promise": "2.0.0"
+      }
+    },
+    "memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "requires": {
+        "errno": "0.1.7",
+        "readable-stream": "2.3.6"
+      }
+    },
+    "meow": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+      "dev": true,
+      "requires": {
+        "camelcase-keys": "2.1.0",
+        "decamelize": "1.2.0",
+        "loud-rejection": "1.6.0",
+        "map-obj": "1.0.1",
+        "minimist": "1.2.0",
+        "normalize-package-data": "2.5.0",
+        "object-assign": "4.1.1",
+        "read-pkg-up": "1.0.1",
+        "redent": "1.0.0",
+        "trim-newlines": "1.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "dev": true,
+          "requires": {
+            "path-exists": "2.1.0",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "load-json-file": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+          "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.15",
+            "parse-json": "2.2.0",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1",
+            "strip-bom": "2.0.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "parse-json": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+          "dev": true,
+          "requires": {
+            "error-ex": "1.3.2"
+          }
+        },
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+          "dev": true,
+          "requires": {
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "path-type": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.15",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "1.1.0",
+            "normalize-package-data": "2.5.0",
+            "path-type": "1.1.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+          "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+          "dev": true,
+          "requires": {
+            "find-up": "1.1.2",
+            "read-pkg": "1.1.0"
+          }
+        },
+        "strip-bom": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+          "dev": true,
+          "requires": {
+            "is-utf8": "0.2.1"
+          }
+        }
+      }
+    },
+    "micromatch": {
+      "version": "2.3.11",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "arr-diff": "2.0.0",
+        "array-unique": "0.2.1",
+        "braces": "1.8.5",
+        "expand-brackets": "0.1.5",
+        "extglob": "0.3.2",
+        "filename-regex": "2.0.1",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1",
+        "kind-of": "3.2.2",
+        "normalize-path": "2.1.1",
+        "object.omit": "2.0.1",
+        "parse-glob": "3.0.4",
+        "regex-cache": "0.4.4"
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "brorand": "1.1.0"
+      }
+    },
+    "mime-db": {
+      "version": "1.38.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
+      "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.22",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz",
+      "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.38.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "dev": true
+    },
+    "min-document": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
+      "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
+      "dev": true,
+      "requires": {
+        "dom-walk": "0.1.1"
+      }
+    },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "1.1.11"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+    },
+    "mississippi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+      "dev": true,
+      "requires": {
+        "concat-stream": "1.6.2",
+        "duplexify": "3.7.1",
+        "end-of-stream": "1.4.1",
+        "flush-write-stream": "1.1.1",
+        "from2": "2.3.0",
+        "parallel-transform": "1.1.0",
+        "pump": "3.0.0",
+        "pumpify": "1.5.1",
+        "stream-each": "1.2.3",
+        "through2": "2.0.5"
+      }
+    },
+    "mixin-deep": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
+      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "dev": true,
+      "requires": {
+        "for-in": "1.0.2",
+        "is-extendable": "1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "2.0.4"
+          }
+        }
+      }
+    },
+    "mixin-object": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
+      "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
+      "dev": true,
+      "requires": {
+        "for-in": "0.1.8",
+        "is-extendable": "0.1.1"
+      },
+      "dependencies": {
+        "for-in": {
+          "version": "0.1.8",
+          "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
+          "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=",
+          "dev": true
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+    },
+    "move-concurrently": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "dev": true,
+      "requires": {
+        "aproba": "1.2.0",
+        "copy-concurrently": "1.0.5",
+        "fs-write-stream-atomic": "1.0.10",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.3",
+        "run-queue": "1.0.3"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+      "dev": true
+    },
+    "nan": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz",
+      "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==",
+      "dev": true
+    },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "4.0.0",
+        "array-unique": "0.3.2",
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
+        "fragment-cache": "0.2.1",
+        "is-windows": "1.0.2",
+        "kind-of": "6.0.2",
+        "object.pick": "1.3.0",
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
+      }
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "neo-async": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz",
+      "integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==",
+      "dev": true
+    },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
+    "no-case": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "dev": true,
+      "requires": {
+        "lower-case": "1.1.4"
+      }
+    },
+    "node-gyp": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
+      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
+      "dev": true,
+      "requires": {
+        "fstream": "1.0.11",
+        "glob": "7.1.3",
+        "graceful-fs": "4.1.15",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6",
+        "npmlog": "4.1.2",
+        "osenv": "0.1.5",
+        "request": "2.88.0",
+        "rimraf": "2.6.3",
+        "semver": "5.3.0",
+        "tar": "2.2.1",
+        "which": "1.3.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+          "dev": true
+        }
+      }
+    },
+    "node-libs-browser": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz",
+      "integrity": "sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==",
+      "dev": true,
+      "requires": {
+        "assert": "1.4.1",
+        "browserify-zlib": "0.2.0",
+        "buffer": "4.9.1",
+        "console-browserify": "1.1.0",
+        "constants-browserify": "1.0.0",
+        "crypto-browserify": "3.12.0",
+        "domain-browser": "1.2.0",
+        "events": "3.0.0",
+        "https-browserify": "1.0.0",
+        "os-browserify": "0.3.0",
+        "path-browserify": "0.0.0",
+        "process": "0.11.10",
+        "punycode": "1.4.1",
+        "querystring-es3": "0.2.1",
+        "readable-stream": "2.3.6",
+        "stream-browserify": "2.0.2",
+        "stream-http": "2.8.3",
+        "string_decoder": "1.1.1",
+        "timers-browserify": "2.0.10",
+        "tty-browserify": "0.0.0",
+        "url": "0.11.0",
+        "util": "0.11.1",
+        "vm-browserify": "0.0.4"
+      },
+      "dependencies": {
+        "process": {
+          "version": "0.11.10",
+          "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+          "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+          "dev": true
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
+        }
+      }
+    },
+    "node-releases": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.8.tgz",
+      "integrity": "sha512-gQm+K9mGCiT/NXHy+V/ZZS1N/LOaGGqRAAJJs3X9Ah1g+CIbRcBgNyoNYQ+SEtcyAtB9KqDruu+fF7nWjsqRaA==",
+      "dev": true,
+      "requires": {
+        "semver": "5.6.0"
+      }
+    },
+    "node-sass": {
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz",
+      "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==",
+      "dev": true,
+      "requires": {
+        "async-foreach": "0.1.3",
+        "chalk": "1.1.3",
+        "cross-spawn": "3.0.1",
+        "gaze": "1.1.3",
+        "get-stdin": "4.0.1",
+        "glob": "7.1.3",
+        "in-publish": "2.0.0",
+        "lodash.assign": "4.2.0",
+        "lodash.clonedeep": "4.5.0",
+        "lodash.mergewith": "4.6.1",
+        "meow": "3.7.0",
+        "mkdirp": "0.5.1",
+        "nan": "2.12.1",
+        "node-gyp": "3.8.0",
+        "npmlog": "4.1.2",
+        "request": "2.88.0",
+        "sass-graph": "2.2.4",
+        "stdout-stream": "1.4.1",
+        "true-case-path": "1.0.3"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "cross-spawn": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
+          "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "4.1.5",
+            "which": "1.3.1"
+          }
+        },
+        "lru-cache": {
+          "version": "4.1.5",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+          "dev": true,
+          "requires": {
+            "pseudomap": "1.0.2",
+            "yallist": "2.1.2"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        },
+        "yallist": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+          "dev": true
+        }
+      }
+    },
+    "nopt": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+      "dev": true,
+      "requires": {
+        "abbrev": "1.1.1"
+      }
+    },
+    "normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "2.7.1",
+        "resolve": "1.10.0",
+        "semver": "5.6.0",
+        "validate-npm-package-license": "3.0.4"
+      }
+    },
+    "normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "requires": {
+        "remove-trailing-separator": "1.1.0"
+      }
+    },
+    "normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "dev": true
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "requires": {
+        "path-key": "2.0.1"
+      }
+    },
+    "npmlog": {
+      "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.5",
+        "console-control-strings": "1.1.0",
+        "gauge": "2.7.4",
+        "set-blocking": "2.0.0"
+      }
+    },
+    "nth-check": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+      "dev": true,
+      "requires": {
+        "boolbase": "1.0.0"
+      }
+    },
+    "num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true
+    },
+    "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="
+    },
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "dev": true
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
+      "requires": {
+        "copy-descriptor": "0.1.1",
+        "define-property": "0.2.5",
+        "kind-of": "3.2.2"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "0.1.6"
+          }
+        }
+      }
+    },
+    "object-keys": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
+      "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==",
+      "dev": true
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "requires": {
+        "isobject": "3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
+      }
+    },
+    "object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.3",
+        "function-bind": "1.1.1",
+        "has-symbols": "1.0.0",
+        "object-keys": "1.1.0"
+      }
+    },
+    "object.entries": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.0.tgz",
+      "integrity": "sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.3",
+        "es-abstract": "1.13.0",
+        "function-bind": "1.1.1",
+        "has": "1.0.3"
+      }
+    },
+    "object.fromentries": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.0.tgz",
+      "integrity": "sha512-9iLiI6H083uiqUuvzyY6qrlmc/Gz8hLQFOcb/Ri/0xXFkSNS3ctV+CbE6yM2+AnkYfOB3dGjdzC0wrMLIhQICA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.3",
+        "es-abstract": "1.13.0",
+        "function-bind": "1.1.1",
+        "has": "1.0.3"
+      }
+    },
+    "object.getownpropertydescriptors": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
+      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.3",
+        "es-abstract": "1.13.0"
+      }
+    },
+    "object.omit": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
+      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "for-own": "0.1.5",
+        "is-extendable": "0.1.1"
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "requires": {
+        "isobject": "3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1.0.2"
+      }
+    },
+    "onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "1.2.0"
+      }
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "dev": true,
+      "requires": {
+        "deep-is": "0.1.3",
+        "fast-levenshtein": "2.0.6",
+        "levn": "0.3.0",
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2",
+        "wordwrap": "1.0.0"
+      }
+    },
+    "os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true
+    },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+    },
+    "os-locale": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "dev": true,
+      "requires": {
+        "lcid": "1.0.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+    },
+    "osenv": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "dev": true,
+      "requires": {
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "output-file-sync": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz",
+      "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.15",
+        "mkdirp": "0.5.1",
+        "object-assign": "4.1.1"
+      }
+    },
+    "p-defer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
+      "dev": true
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true
+    },
+    "p-is-promise": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz",
+      "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz",
+      "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==",
+      "dev": true,
+      "requires": {
+        "p-try": "2.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "requires": {
+        "p-limit": "2.1.0"
+      }
+    },
+    "p-try": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
+      "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
+      "dev": true
+    },
+    "pako": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.8.tgz",
+      "integrity": "sha512-6i0HVbUfcKaTv+EG8ZTr75az7GFXcLYk9UyLEg7Notv/Ma+z/UG3TCoz6GiNeOrn1E/e63I0X/Hpw18jHOTUnA==",
+      "dev": true
+    },
+    "parallel-transform": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
+      "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+      "dev": true,
+      "requires": {
+        "cyclist": "0.2.2",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
+      }
+    },
+    "param-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
+      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
+      "dev": true,
+      "requires": {
+        "no-case": "2.3.2"
+      }
+    },
+    "parent-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.0.tgz",
+      "integrity": "sha512-8Mf5juOMmiE4FcmzYc4IaiS9L3+9paz2KOiXzkRviCP6aDmN49Hz6EMWz0lGNp9pX80GvvAuLADtyGfW/Em3TA==",
+      "dev": true,
+      "requires": {
+        "callsites": "3.0.0"
+      }
+    },
+    "parse-asn1": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
+      "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
+      "dev": true,
+      "requires": {
+        "asn1.js": "4.10.1",
+        "browserify-aes": "1.2.0",
+        "create-hash": "1.2.0",
+        "evp_bytestokey": "1.0.3",
+        "pbkdf2": "3.0.17",
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "parse-glob": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "glob-base": "0.3.0",
+        "is-dotfile": "1.0.3",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1"
+      }
+    },
+    "parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+      "dev": true,
+      "requires": {
+        "error-ex": "1.3.2",
+        "json-parse-better-errors": "1.0.2"
+      }
+    },
+    "parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+      "dev": true
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true
+    },
+    "path-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
+      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
+      "dev": true
+    },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "dev": true
+    },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
+    },
+    "path-type": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+      "dev": true,
+      "requires": {
+        "pify": "3.0.0"
+      }
+    },
+    "pbkdf2": {
+      "version": "3.0.17",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
+      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
+      "dev": true,
+      "requires": {
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "ripemd160": "2.0.2",
+        "safe-buffer": "5.1.2",
+        "sha.js": "2.4.11"
+      }
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "dev": true
+    },
+    "pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+      "dev": true
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "2.0.4"
+      }
+    },
+    "pkg-dir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+      "dev": true,
+      "requires": {
+        "find-up": "3.0.0"
+      }
+    },
+    "please-upgrade-node": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz",
+      "integrity": "sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ==",
+      "dev": true,
+      "requires": {
+        "semver-compare": "1.0.0"
+      }
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "dev": true
+    },
+    "postcss": {
+      "version": "7.0.14",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
+      "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
+      "dev": true,
+      "requires": {
+        "chalk": "2.4.2",
+        "source-map": "0.6.1",
+        "supports-color": "6.1.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "postcss-load-config": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.0.0.tgz",
+      "integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "4.0.0",
+        "import-cwd": "2.1.0"
+      }
+    },
+    "postcss-loader": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
+      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.2.3",
+        "postcss": "7.0.14",
+        "postcss-load-config": "2.0.0",
+        "schema-utils": "1.0.0"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.9.2",
+            "ajv-errors": "1.0.1",
+            "ajv-keywords": "3.4.0"
+          }
+        }
+      }
+    },
+    "postcss-modules-extract-imports": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
+      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
+      "dev": true,
+      "requires": {
+        "postcss": "7.0.14"
+      }
+    },
+    "postcss-modules-local-by-default": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz",
+      "integrity": "sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==",
+      "dev": true,
+      "requires": {
+        "postcss": "7.0.14",
+        "postcss-selector-parser": "6.0.0",
+        "postcss-value-parser": "3.3.1"
+      }
+    },
+    "postcss-modules-scope": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz",
+      "integrity": "sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A==",
+      "dev": true,
+      "requires": {
+        "postcss": "7.0.14",
+        "postcss-selector-parser": "6.0.0"
+      }
+    },
+    "postcss-modules-values": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz",
+      "integrity": "sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==",
+      "dev": true,
+      "requires": {
+        "icss-replace-symbols": "1.1.0",
+        "postcss": "7.0.14"
+      }
+    },
+    "postcss-selector-parser": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.0.tgz",
+      "integrity": "sha512-E4EHwWgh5NIh/F44hYfQHR1jwejCza1ktpeWTetDtc71hxdDmWPjfSs28/58DBDIKxz5Dxlw8oW6am2ph/OCkg==",
+      "dev": true,
+      "requires": {
+        "cssesc": "3.0.0",
+        "indexes-of": "1.0.1",
+        "uniq": "1.0.1"
+      }
+    },
+    "postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
+    },
+    "preserve": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
+      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
+      "dev": true,
+      "optional": true
+    },
+    "pretty-error": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
+      "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
+      "dev": true,
+      "requires": {
+        "renderkid": "2.0.3",
+        "utila": "0.4.0"
+      }
+    },
+    "private": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
+    },
+    "process": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz",
+      "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=",
+      "dev": true
+    },
+    "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
+    },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true
+    },
+    "promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+      "dev": true
+    },
+    "prop-types": {
+      "version": "15.7.2",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+      "requires": {
+        "loose-envify": "1.4.0",
+        "object-assign": "4.1.1",
+        "react-is": "16.8.3"
+      }
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true
+    },
+    "psl": {
+      "version": "1.1.31",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
+      "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==",
+      "dev": true
+    },
+    "public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.2.0",
+        "parse-asn1": "5.1.4",
+        "randombytes": "2.1.0",
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "1.4.1",
+        "once": "1.4.0"
+      }
+    },
+    "pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
+      "requires": {
+        "duplexify": "3.7.1",
+        "inherits": "2.0.3",
+        "pump": "2.0.1"
+      },
+      "dependencies": {
+        "pump": {
+          "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.4.1",
+            "once": "1.4.0"
+          }
+        }
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "dev": true
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "dev": true
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true
+    },
+    "randomatic": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
+      "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "is-number": "4.0.0",
+        "kind-of": "6.0.2",
+        "math-random": "1.0.4"
+      },
+      "dependencies": {
+        "is-number": {
+          "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,
+          "optional": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "2.1.0",
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "react": {
+      "version": "16.8.4",
+      "resolved": "https://registry.npmjs.org/react/-/react-16.8.4.tgz",
+      "integrity": "sha512-0GQ6gFXfUH7aZcjGVymlPOASTuSjlQL4ZtVC5YKH+3JL6bBLCVO21DknzmaPlI90LN253ojj02nsapy+j7wIjg==",
+      "requires": {
+        "loose-envify": "1.4.0",
+        "object-assign": "4.1.1",
+        "prop-types": "15.7.2",
+        "scheduler": "0.13.4"
+      }
+    },
+    "react-deep-force-update": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/react-deep-force-update/-/react-deep-force-update-1.1.2.tgz",
+      "integrity": "sha512-WUSQJ4P/wWcusaH+zZmbECOk7H5N2pOIl0vzheeornkIMhu+qrNdGFm0bDZLCb0hSF0jf/kH1SgkNGfBdTc4wA==",
+      "dev": true
+    },
+    "react-dom": {
+      "version": "16.8.4",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.8.4.tgz",
+      "integrity": "sha512-Ob2wK7XG2tUDt7ps7LtLzGYYB6DXMCLj0G5fO6WeEICtT4/HdpOi7W/xLzZnR6RCG1tYza60nMdqtxzA8FaPJQ==",
+      "requires": {
+        "loose-envify": "1.4.0",
+        "object-assign": "4.1.1",
+        "prop-types": "15.7.2",
+        "scheduler": "0.13.4"
+      }
+    },
+    "react-is": {
+      "version": "16.8.3",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.3.tgz",
+      "integrity": "sha512-Y4rC1ZJmsxxkkPuMLwvKvlL1Zfpbcu+Bf4ZigkHup3v9EfdYhAlWAaVyA19olXq2o2mGn0w+dFKvk3pVVlYcIA=="
+    },
+    "react-proxy": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/react-proxy/-/react-proxy-1.1.8.tgz",
+      "integrity": "sha1-nb/Z2SdSjDqp9ETkVYw3gwq4wmo=",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.11",
+        "react-deep-force-update": "1.1.2"
+      }
+    },
+    "react-transform-catch-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/react-transform-catch-errors/-/react-transform-catch-errors-1.0.2.tgz",
+      "integrity": "sha1-G01KdulycYlvwW/jCGx5PsiKnus=",
+      "dev": true
+    },
+    "react-transform-hmr": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/react-transform-hmr/-/react-transform-hmr-1.0.4.tgz",
+      "integrity": "sha1-4aQL0Krvxy6N/Xp82gmvhQZjl7s=",
+      "dev": true,
+      "requires": {
+        "global": "4.3.2",
+        "react-proxy": "1.1.8"
+      }
+    },
+    "read-pkg": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+      "dev": true,
+      "requires": {
+        "load-json-file": "4.0.0",
+        "normalize-package-data": "2.5.0",
+        "path-type": "3.0.0"
+      }
+    },
+    "read-pkg-up": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz",
+      "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
+      "dev": true,
+      "requires": {
+        "find-up": "3.0.0",
+        "read-pkg": "3.0.0"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "dev": true,
+      "requires": {
+        "core-util-is": "1.0.2",
+        "inherits": "2.0.3",
+        "isarray": "1.0.0",
+        "process-nextick-args": "2.0.0",
+        "safe-buffer": "5.1.2",
+        "string_decoder": "1.1.1",
+        "util-deprecate": "1.0.2"
+      }
+    },
+    "readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.15",
+        "micromatch": "3.1.10",
+        "readable-stream": "2.3.6"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+          "dev": true
+        },
+        "braces": {
+          "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",
+            "extend-shallow": "2.0.1",
+            "fill-range": "4.0.0",
+            "isobject": "3.0.1",
+            "repeat-element": "1.1.3",
+            "snapdragon": "0.8.2",
+            "snapdragon-node": "2.1.1",
+            "split-string": "3.1.0",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "define-property": "0.2.5",
+            "extend-shallow": "2.0.1",
+            "posix-character-classes": "0.1.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "0.1.6"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            },
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+              "dev": true,
+              "requires": {
+                "kind-of": "3.2.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.6"
+                  }
+                }
+              }
+            },
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+              "dev": true,
+              "requires": {
+                "kind-of": "3.2.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.6"
+                  }
+                }
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "0.1.6",
+                "is-data-descriptor": "0.1.4",
+                "kind-of": "5.1.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+              "dev": true
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "0.3.2",
+            "define-property": "1.0.0",
+            "expand-brackets": "2.1.4",
+            "extend-shallow": "2.0.1",
+            "fragment-cache": "0.2.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
+          },
+          "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.2"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "2.0.1",
+            "is-number": "3.0.0",
+            "repeat-string": "1.6.1",
+            "to-regex-range": "2.1.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
+          }
+        },
+        "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.2.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.6"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "braces": "2.3.2",
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "extglob": "2.0.4",
+            "fragment-cache": "0.2.1",
+            "kind-of": "6.0.2",
+            "nanomatch": "1.2.13",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
+          }
+        }
+      }
+    },
+    "redbox-react": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/redbox-react/-/redbox-react-1.6.0.tgz",
+      "integrity": "sha512-mLjM5eYR41yOp5YKHpd3syFeGq6B4Wj5vZr64nbLvTZW5ZLff4LYk7VE4ITpVxkZpCY6OZuqh0HiP3A3uEaCpg==",
+      "dev": true,
+      "requires": {
+        "error-stack-parser": "1.3.6",
+        "object-assign": "4.1.1",
+        "prop-types": "15.7.2",
+        "sourcemapped-stacktrace": "1.1.9"
+      }
+    },
+    "redent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+      "dev": true,
+      "requires": {
+        "indent-string": "2.1.0",
+        "strip-indent": "1.0.1"
+      }
+    },
+    "regenerate": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
+      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
+      "dev": true
+    },
+    "regenerator-runtime": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+    },
+    "regenerator-transform": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
+      "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "private": "0.1.8"
+      }
+    },
+    "regex-cache": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "is-equal-shallow": "0.1.3"
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "3.0.2",
+        "safe-regex": "1.1.0"
+      }
+    },
+    "regexpp": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
+      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
+      "dev": true
+    },
+    "regexpu-core": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
+      "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
+      "dev": true,
+      "requires": {
+        "regenerate": "1.4.0",
+        "regjsgen": "0.2.0",
+        "regjsparser": "0.1.5"
+      }
+    },
+    "regjsgen": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+      "dev": true
+    },
+    "regjsparser": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+      "dev": true,
+      "requires": {
+        "jsesc": "0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+          "dev": true
+        }
+      }
+    },
+    "relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
+      "dev": true
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true
+    },
+    "renderkid": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz",
+      "integrity": "sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==",
+      "dev": true,
+      "requires": {
+        "css-select": "1.2.0",
+        "dom-converter": "0.2.0",
+        "htmlparser2": "3.10.1",
+        "strip-ansi": "3.0.1",
+        "utila": "0.4.0"
+      }
+    },
+    "repeat-element": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "requires": {
+        "is-finite": "1.0.2"
+      }
+    },
+    "request": {
+      "version": "2.88.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+      "dev": true,
+      "requires": {
+        "aws-sign2": "0.7.0",
+        "aws4": "1.8.0",
+        "caseless": "0.12.0",
+        "combined-stream": "1.0.7",
+        "extend": "3.0.2",
+        "forever-agent": "0.6.1",
+        "form-data": "2.3.3",
+        "har-validator": "5.1.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.22",
+        "oauth-sign": "0.9.0",
+        "performance-now": "2.1.0",
+        "qs": "6.5.2",
+        "safe-buffer": "5.1.2",
+        "tough-cookie": "2.4.3",
+        "tunnel-agent": "0.6.0",
+        "uuid": "3.3.2"
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
+      "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+      "dev": true,
+      "requires": {
+        "path-parse": "1.0.6"
+      }
+    },
+    "resolve-cwd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "3.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+          "dev": true
+        }
+      }
+    },
+    "resolve-dir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "2.0.2",
+        "global-modules": "1.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "dev": true
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "dev": true,
+      "requires": {
+        "onetime": "2.0.1",
+        "signal-exit": "3.0.2"
+      }
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.3"
+      }
+    },
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "requires": {
+        "hash-base": "3.0.4",
+        "inherits": "2.0.3"
+      }
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "dev": true,
+      "requires": {
+        "is-promise": "2.1.0"
+      }
+    },
+    "run-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/run-node/-/run-node-1.0.0.tgz",
+      "integrity": "sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==",
+      "dev": true
+    },
+    "run-queue": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "dev": true,
+      "requires": {
+        "aproba": "1.2.0"
+      }
+    },
+    "rxjs": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+      "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
+      "dev": true,
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "requires": {
+        "ret": "0.1.15"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "sass-graph": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
+      "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.3",
+        "lodash": "4.17.11",
+        "scss-tokenizer": "0.2.3",
+        "yargs": "7.1.0"
+      }
+    },
+    "sass-loader": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz",
+      "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==",
+      "dev": true,
+      "requires": {
+        "clone-deep": "2.0.2",
+        "loader-utils": "1.2.3",
+        "lodash.tail": "4.1.1",
+        "neo-async": "2.6.0",
+        "pify": "3.0.0",
+        "semver": "5.6.0"
+      }
+    },
+    "scheduler": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.4.tgz",
+      "integrity": "sha512-cvSOlRPxOHs5dAhP9yiS/6IDmVAVxmk33f0CtTJRkmUWcb1Us+t7b1wqdzoC0REw2muC9V5f1L/w5R5uKGaepA==",
+      "requires": {
+        "loose-envify": "1.4.0",
+        "object-assign": "4.1.1"
+      }
+    },
+    "schema-utils": {
+      "version": "0.4.7",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
+      "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
+      "dev": true,
+      "requires": {
+        "ajv": "6.9.2",
+        "ajv-keywords": "3.4.0"
+      }
+    },
+    "scss-tokenizer": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
+      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
+      "dev": true,
+      "requires": {
+        "js-base64": "2.5.1",
+        "source-map": "0.4.4"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
+    "semver": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+      "dev": true
+    },
+    "semver-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
+      "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=",
+      "dev": true
+    },
+    "serialize-javascript": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz",
+      "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==",
+      "dev": true
+    },
+    "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
+    },
+    "set-value": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
+      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "2.0.1",
+        "is-extendable": "0.1.1",
+        "is-plain-object": "2.0.4",
+        "split-string": "3.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "0.1.1"
+          }
+        }
+      }
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "shallow-clone": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz",
+      "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
+      "dev": true,
+      "requires": {
+        "is-extendable": "0.1.1",
+        "kind-of": "5.1.0",
+        "mixin-object": "2.0.1"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU="
+    },
+    "slice-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "3.2.1",
+        "astral-regex": "1.0.0",
+        "is-fullwidth-code-point": "2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.3"
+          }
+        }
+      }
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "requires": {
+        "base": "0.11.2",
+        "debug": "2.6.9",
+        "define-property": "0.2.5",
+        "extend-shallow": "2.0.1",
+        "map-cache": "0.2.2",
+        "source-map": "0.5.7",
+        "source-map-resolve": "0.5.2",
+        "use": "3.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "0.1.6"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "0.1.1"
+          }
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "requires": {
+        "define-property": "1.0.0",
+        "isobject": "3.0.1",
+        "snapdragon-util": "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.2"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2"
+      }
+    },
+    "source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+    },
+    "source-map-resolve": {
+      "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": "2.1.2",
+        "decode-uri-component": "0.2.0",
+        "resolve-url": "0.2.1",
+        "source-map-url": "0.4.0",
+        "urix": "0.1.0"
+      }
+    },
+    "source-map-support": {
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+      "requires": {
+        "source-map": "0.5.7"
+      }
+    },
+    "source-map-url": {
+      "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": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/sourcemapped-stacktrace/-/sourcemapped-stacktrace-1.1.9.tgz",
+      "integrity": "sha512-N6SLOT+9OQZdoSpu1PkSjyrxx/B2SGom9LuxjbwZFNNz7+FpMEUpwb3JV+UpaxWvoGM/8k7guuOJxcB6BWEU9Q==",
+      "dev": true,
+      "requires": {
+        "source-map": "0.5.6"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.6",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
+          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
+          "dev": true
+        }
+      }
+    },
+    "spdx-correct": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+      "dev": true,
+      "requires": {
+        "spdx-expression-parse": "3.0.0",
+        "spdx-license-ids": "3.0.3"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
+      "dev": true
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "2.2.0",
+        "spdx-license-ids": "3.0.3"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
+      "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==",
+      "dev": true
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "3.0.2"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "dev": true,
+      "requires": {
+        "asn1": "0.2.4",
+        "assert-plus": "1.0.0",
+        "bcrypt-pbkdf": "1.0.2",
+        "dashdash": "1.14.1",
+        "ecc-jsbn": "0.1.2",
+        "getpass": "0.1.7",
+        "jsbn": "0.1.1",
+        "safer-buffer": "2.1.2",
+        "tweetnacl": "0.14.5"
+      }
+    },
+    "ssri": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "dev": true,
+      "requires": {
+        "figgy-pudding": "3.5.1"
+      }
+    },
+    "stackframe": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-0.3.1.tgz",
+      "integrity": "sha1-M6qE8Rd6VUjIk1Uzy/6zQgl19aQ=",
+      "dev": true
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
+      "requires": {
+        "define-property": "0.2.5",
+        "object-copy": "0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "0.1.6"
+          }
+        }
+      }
+    },
+    "stdout-stream": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
+      "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.6"
+      }
+    },
+    "stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
+      }
+    },
+    "stream-each": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "1.4.1",
+        "stream-shift": "1.0.0"
+      }
+    },
+    "stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
+      "requires": {
+        "builtin-status-codes": "3.0.0",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6",
+        "to-arraybuffer": "1.0.1",
+        "xtend": "4.0.1"
+      }
+    },
+    "stream-shift": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+      "dev": true
+    },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dev": true,
+      "requires": {
+        "is-fullwidth-code-point": "2.0.0",
+        "strip-ansi": "4.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        }
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "requires": {
+        "ansi-regex": "2.1.1"
+      }
+    },
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true
+    },
+    "strip-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+      "dev": true,
+      "requires": {
+        "get-stdin": "4.0.1"
+      }
+    },
+    "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
+    },
+    "style-loader": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz",
+      "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.2.3",
+        "schema-utils": "1.0.0"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.9.2",
+            "ajv-errors": "1.0.1",
+            "ajv-keywords": "3.4.0"
+          }
+        }
+      }
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "requires": {
+        "has-flag": "3.0.0"
+      }
+    },
+    "table": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.2.3.tgz",
+      "integrity": "sha512-N2RsDAMvDLvYwFcwbPyF3VmVSSkuF+G1e+8inhBLtHpvwXGw4QRPEZhihQNeEN0i1up6/f6ObCJXNdlRG3YVyQ==",
+      "dev": true,
+      "requires": {
+        "ajv": "6.9.2",
+        "lodash": "4.17.11",
+        "slice-ansi": "2.1.0",
+        "string-width": "3.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
+          "integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.0.0.tgz",
+          "integrity": "sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "7.0.3",
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "5.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
+          "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "4.0.0"
+          }
+        }
+      }
+    },
+    "tapable": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.1.tgz",
+      "integrity": "sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==",
+      "dev": true
+    },
+    "tar": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+      "dev": true,
+      "requires": {
+        "block-stream": "0.0.9",
+        "fstream": "1.0.11",
+        "inherits": "2.0.3"
+      }
+    },
+    "terser": {
+      "version": "3.16.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-3.16.1.tgz",
+      "integrity": "sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==",
+      "dev": true,
+      "requires": {
+        "commander": "2.17.1",
+        "source-map": "0.6.1",
+        "source-map-support": "0.5.10"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.17.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "source-map-support": {
+          "version": "0.5.10",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz",
+          "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==",
+          "dev": true,
+          "requires": {
+            "buffer-from": "1.1.1",
+            "source-map": "0.6.1"
+          }
+        }
+      }
+    },
+    "terser-webpack-plugin": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz",
+      "integrity": "sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==",
+      "dev": true,
+      "requires": {
+        "cacache": "11.3.2",
+        "find-cache-dir": "2.0.0",
+        "schema-utils": "1.0.0",
+        "serialize-javascript": "1.6.1",
+        "source-map": "0.6.1",
+        "terser": "3.16.1",
+        "webpack-sources": "1.3.0",
+        "worker-farm": "1.6.0"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.9.2",
+            "ajv-errors": "1.0.1",
+            "ajv-keywords": "3.4.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "test-exclude": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.1.0.tgz",
+      "integrity": "sha512-gwf0S2fFsANC55fSeSqpb8BYk6w3FDvwZxfNjeF6FRgvFa43r+7wRiA/Q0IxoRU37wB/LE8IQ4221BsNucTaCA==",
+      "dev": true,
+      "requires": {
+        "arrify": "1.0.1",
+        "minimatch": "3.0.4",
+        "read-pkg-up": "4.0.0",
+        "require-main-filename": "1.0.1"
+      }
+    },
+    "text-loader": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/text-loader/-/text-loader-0.0.1.tgz",
+      "integrity": "sha1-i/dddJt8BXnJOZIAUcaepXLr3cE=",
+      "dev": true
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.6",
+        "xtend": "4.0.1"
+      }
+    },
+    "timers-browserify": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
+      "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
+      "dev": true,
+      "requires": {
+        "setimmediate": "1.0.5"
+      }
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc="
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2"
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "requires": {
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
+        "regex-not": "1.0.2",
+        "safe-regex": "1.1.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "requires": {
+        "is-number": "3.0.0",
+        "repeat-string": "1.6.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.2.2"
+          }
+        }
+      }
+    },
+    "toposort": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",
+      "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=",
+      "dev": true
+    },
+    "tough-cookie": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+      "dev": true,
+      "requires": {
+        "psl": "1.1.31",
+        "punycode": "1.4.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
+        }
+      }
+    },
+    "trim-newlines": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+      "dev": true
+    },
+    "trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
+    },
+    "true-case-path": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
+      "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.3"
+      }
+    },
+    "tslib": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
+      "dev": true
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "tunnel-agent": {
+      "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.1.2"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "1.1.2"
+      }
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "uglify-js": {
+      "version": "3.4.9",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",
+      "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
+      "dev": true,
+      "requires": {
+        "commander": "2.17.1",
+        "source-map": "0.6.1"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.17.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "unicons": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/unicons/-/unicons-0.0.3.tgz",
+      "integrity": "sha1-bmp6Gm6uuwHKPYsSrZaHJ56rpSQ=",
+      "dev": true
+    },
+    "union-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
+      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "dev": true,
+      "requires": {
+        "arr-union": "3.1.0",
+        "get-value": "2.0.6",
+        "is-extendable": "0.1.1",
+        "set-value": "0.4.3"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "0.1.1"
+          }
+        },
+        "set-value": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
+          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "2.0.1",
+            "is-extendable": "0.1.1",
+            "is-plain-object": "2.0.4",
+            "to-object-path": "0.3.0"
+          }
+        }
+      }
+    },
+    "uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+      "dev": true
+    },
+    "unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "dev": true,
+      "requires": {
+        "unique-slug": "2.0.1"
+      }
+    },
+    "unique-slug": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
+      "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "0.1.4"
+      }
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
+      "requires": {
+        "has-value": "0.3.1",
+        "isobject": "3.0.1"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "dev": true,
+          "requires": {
+            "get-value": "2.0.6",
+            "has-values": "0.1.4",
+            "isobject": "2.1.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+          "dev": true
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "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
+    },
+    "upper-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
+      "dev": true
+    },
+    "uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "dev": true,
+      "requires": {
+        "punycode": "2.1.1"
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "dev": true
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+          "dev": true
+        }
+      }
+    },
+    "url-loader": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-1.1.2.tgz",
+      "integrity": "sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.2.3",
+        "mime": "2.4.0",
+        "schema-utils": "1.0.0"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+          "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.9.2",
+            "ajv-errors": "1.0.1",
+            "ajv-keywords": "3.4.0"
+          }
+        }
+      }
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true
+    },
+    "user-home": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+      "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
+      "dev": true
+    },
+    "util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "util.promisify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
+      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.3",
+        "object.getownpropertydescriptors": "2.0.3"
+      }
+    },
+    "utila": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
+      "dev": true
+    },
+    "uuid": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+      "dev": true
+    },
+    "v8-compile-cache": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz",
+      "integrity": "sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==",
+      "dev": true
+    },
+    "v8flags": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
+      "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
+      "dev": true,
+      "requires": {
+        "user-home": "1.1.1"
+      }
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "3.1.0",
+        "spdx-expression-parse": "3.0.0"
+      }
+    },
+    "verror": {
+      "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",
+        "extsprintf": "1.3.0"
+      }
+    },
+    "vm-browserify": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+      "dev": true,
+      "requires": {
+        "indexof": "0.0.1"
+      }
+    },
+    "watchpack": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
+      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+      "dev": true,
+      "requires": {
+        "chokidar": "2.1.2",
+        "graceful-fs": "4.1.15",
+        "neo-async": "2.6.0"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "requires": {
+            "micromatch": "3.1.10",
+            "normalize-path": "2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "dev": true,
+              "requires": {
+                "remove-trailing-separator": "1.1.0"
+              }
+            }
+          }
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+          "dev": true
+        },
+        "braces": {
+          "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",
+            "extend-shallow": "2.0.1",
+            "fill-range": "4.0.0",
+            "isobject": "3.0.1",
+            "repeat-element": "1.1.3",
+            "snapdragon": "0.8.2",
+            "snapdragon-node": "2.1.1",
+            "split-string": "3.1.0",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "chokidar": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.2.tgz",
+          "integrity": "sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==",
+          "dev": true,
+          "requires": {
+            "anymatch": "2.0.0",
+            "async-each": "1.0.1",
+            "braces": "2.3.2",
+            "fsevents": "1.2.7",
+            "glob-parent": "3.1.0",
+            "inherits": "2.0.3",
+            "is-binary-path": "1.0.1",
+            "is-glob": "4.0.0",
+            "normalize-path": "3.0.0",
+            "path-is-absolute": "1.0.1",
+            "readdirp": "2.2.1",
+            "upath": "1.1.0"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "define-property": "0.2.5",
+            "extend-shallow": "2.0.1",
+            "posix-character-classes": "0.1.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "0.1.6"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            },
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+              "dev": true,
+              "requires": {
+                "kind-of": "3.2.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.6"
+                  }
+                }
+              }
+            },
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+              "dev": true,
+              "requires": {
+                "kind-of": "3.2.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.6"
+                  }
+                }
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "0.1.6",
+                "is-data-descriptor": "0.1.4",
+                "kind-of": "5.1.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+              "dev": true
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "0.3.2",
+            "define-property": "1.0.0",
+            "expand-brackets": "2.1.4",
+            "extend-shallow": "2.0.1",
+            "fragment-cache": "0.2.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
+          },
+          "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.2"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "2.0.1",
+            "is-number": "3.0.0",
+            "repeat-string": "1.6.1",
+            "to-regex-range": "2.1.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "dev": true,
+          "requires": {
+            "is-glob": "3.1.0",
+            "path-dirname": "1.0.2"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "dev": true,
+              "requires": {
+                "is-extglob": "2.1.1"
+              }
+            }
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
+          "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "2.1.1"
+          }
+        },
+        "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.2.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.6"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "braces": "2.3.2",
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "extglob": "2.0.4",
+            "fragment-cache": "0.2.1",
+            "kind-of": "6.0.2",
+            "nanomatch": "1.2.13",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
+          }
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        }
+      }
+    },
+    "webpack": {
+      "version": "4.29.6",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.6.tgz",
+      "integrity": "sha512-MwBwpiE1BQpMDkbnUUaW6K8RFZjljJHArC6tWQJoFm0oQtfoSebtg4Y7/QHnJ/SddtjYLHaKGX64CFjG5rehJw==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/wasm-edit": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "acorn": "6.1.0",
+        "acorn-dynamic-import": "4.0.0",
+        "ajv": "6.9.2",
+        "ajv-keywords": "3.4.0",
+        "chrome-trace-event": "1.0.0",
+        "enhanced-resolve": "4.1.0",
+        "eslint-scope": "4.0.0",
+        "json-parse-better-errors": "1.0.2",
+        "loader-runner": "2.4.0",
+        "loader-utils": "1.2.3",
+        "memory-fs": "0.4.1",
+        "micromatch": "3.1.10",
+        "mkdirp": "0.5.1",
+        "neo-async": "2.6.0",
+        "node-libs-browser": "2.2.0",
+        "schema-utils": "1.0.0",
+        "tapable": "1.1.1",
+        "terser-webpack-plugin": "1.2.3",
+        "watchpack": "1.6.0",
+        "webpack-sources": "1.3.0"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+          "dev": true
+        },
+        "braces": {
+          "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",
+            "extend-shallow": "2.0.1",
+            "fill-range": "4.0.0",
+            "isobject": "3.0.1",
+            "repeat-element": "1.1.3",
+            "snapdragon": "0.8.2",
+            "snapdragon-node": "2.1.1",
+            "split-string": "3.1.0",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "eslint-scope": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
+          "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "4.2.1",
+            "estraverse": "4.2.0"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "define-property": "0.2.5",
+            "extend-shallow": "2.0.1",
+            "posix-character-classes": "0.1.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "0.1.6"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            },
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+              "dev": true,
+              "requires": {
+                "kind-of": "3.2.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.6"
+                  }
+                }
+              }
+            },
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+              "dev": true,
+              "requires": {
+                "kind-of": "3.2.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.6"
+                  }
+                }
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "0.1.6",
+                "is-data-descriptor": "0.1.4",
+                "kind-of": "5.1.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+              "dev": true
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "0.3.2",
+            "define-property": "1.0.0",
+            "expand-brackets": "2.1.4",
+            "extend-shallow": "2.0.1",
+            "fragment-cache": "0.2.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
+          },
+          "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.2"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "2.0.1",
+            "is-number": "3.0.0",
+            "repeat-string": "1.6.1",
+            "to-regex-range": "2.1.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
+          }
+        },
+        "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.2.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.6"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "braces": "2.3.2",
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "extglob": "2.0.4",
+            "fragment-cache": "0.2.1",
+            "kind-of": "6.0.2",
+            "nanomatch": "1.2.13",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
+          }
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.9.2",
+            "ajv-errors": "1.0.1",
+            "ajv-keywords": "3.4.0"
+          }
+        }
+      }
+    },
+    "webpack-cli": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.2.3.tgz",
+      "integrity": "sha512-Ik3SjV6uJtWIAN5jp5ZuBMWEAaP5E4V78XJ2nI+paFPh8v4HPSwo/myN0r29Xc/6ZKnd2IdrAlpSgNOu2CDQ6Q==",
+      "dev": true,
+      "requires": {
+        "chalk": "2.4.2",
+        "cross-spawn": "6.0.5",
+        "enhanced-resolve": "4.1.0",
+        "findup-sync": "2.0.0",
+        "global-modules": "1.0.0",
+        "import-local": "2.0.0",
+        "interpret": "1.2.0",
+        "loader-utils": "1.2.3",
+        "supports-color": "5.5.0",
+        "v8-compile-cache": "2.0.2",
+        "yargs": "12.0.5"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.2.0.tgz",
+          "integrity": "sha512-IXFsBS2pC+X0j0N/GE7Dm7j3bsEBp+oTpb7F50dwEVX7rf3IgwO9XatnegTsDtniKCUtEJH4fSU6Asw7uoVLfQ==",
+          "dev": true
+        },
+        "cliui": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "2.1.1",
+            "strip-ansi": "4.0.0",
+            "wrap-ansi": "2.1.0"
+          }
+        },
+        "invert-kv": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+          "dev": true
+        },
+        "lcid": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+          "dev": true,
+          "requires": {
+            "invert-kv": "2.0.0"
+          }
+        },
+        "os-locale": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+          "dev": true,
+          "requires": {
+            "execa": "1.0.0",
+            "lcid": "2.0.0",
+            "mem": "4.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "12.0.5",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
+          "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+          "dev": true,
+          "requires": {
+            "cliui": "4.1.0",
+            "decamelize": "1.2.0",
+            "find-up": "3.0.0",
+            "get-caller-file": "1.0.3",
+            "os-locale": "3.1.0",
+            "require-directory": "2.1.1",
+            "require-main-filename": "1.0.1",
+            "set-blocking": "2.0.0",
+            "string-width": "2.1.1",
+            "which-module": "2.0.0",
+            "y18n": "4.0.0",
+            "yargs-parser": "11.1.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "11.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
+          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "5.2.0",
+            "decamelize": "1.2.0"
+          }
+        }
+      }
+    },
+    "webpack-log": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
+      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "3.2.3",
+        "uuid": "3.3.2"
+      }
+    },
+    "webpack-md5-hash": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/webpack-md5-hash/-/webpack-md5-hash-0.0.6.tgz",
+      "integrity": "sha512-HrQ0AJpeXHRa3IjsgyyEfTx8EqYs5y/4x/WklSYsNDcqBixHzCkrmJV5U+4ks+sx7ycKoIdqWLdyuk913FCS+Q==",
+      "dev": true,
+      "requires": {
+        "md5": "2.2.1"
+      }
+    },
+    "webpack-sources": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz",
+      "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==",
+      "dev": true,
+      "requires": {
+        "source-list-map": "2.0.1",
+        "source-map": "0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "requires": {
+        "isexe": "2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+      "dev": true
+    },
+    "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": "2.1.1"
+      }
+    },
+    "wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+      "dev": true
+    },
+    "worker-farm": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
+      "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
+      "dev": true,
+      "requires": {
+        "errno": "0.1.7"
+      }
+    },
+    "wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "dev": true,
+      "requires": {
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1"
+      },
+      "dependencies": {
+        "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.1"
+          }
+        },
+        "string-width": {
+          "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.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        }
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "write": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
+      "dev": true,
+      "requires": {
+        "mkdirp": "0.5.1"
+      }
+    },
+    "xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
+    },
+    "y18n": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "dev": true
+    },
+    "yallist": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+      "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+      "dev": true
+    },
+    "yargs": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+      "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+      "dev": true,
+      "requires": {
+        "camelcase": "3.0.0",
+        "cliui": "3.2.0",
+        "decamelize": "1.2.0",
+        "get-caller-file": "1.0.3",
+        "os-locale": "1.4.0",
+        "read-pkg-up": "1.0.1",
+        "require-directory": "2.1.1",
+        "require-main-filename": "1.0.1",
+        "set-blocking": "2.0.0",
+        "string-width": "1.0.2",
+        "which-module": "1.0.0",
+        "y18n": "3.2.1",
+        "yargs-parser": "5.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
+        },
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "dev": true,
+          "requires": {
+            "path-exists": "2.1.0",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "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.1"
+          }
+        },
+        "load-json-file": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+          "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.15",
+            "parse-json": "2.2.0",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1",
+            "strip-bom": "2.0.0"
+          }
+        },
+        "parse-json": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+          "dev": true,
+          "requires": {
+            "error-ex": "1.3.2"
+          }
+        },
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+          "dev": true,
+          "requires": {
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "path-type": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.15",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "1.1.0",
+            "normalize-package-data": "2.5.0",
+            "path-type": "1.1.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+          "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+          "dev": true,
+          "requires": {
+            "find-up": "1.1.2",
+            "read-pkg": "1.1.0"
+          }
+        },
+        "string-width": {
+          "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.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
+        "strip-bom": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+          "dev": true,
+          "requires": {
+            "is-utf8": "0.2.1"
+          }
+        },
+        "y18n": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "dev": true
+        }
+      }
+    },
+    "yargs-parser": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
+      "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+      "dev": true,
+      "requires": {
+        "camelcase": "3.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
+        }
+      }
+    }
+  }
+}
diff --git a/Dashboard/package.json b/Dashboard/package.json
new file mode 100644
index 0000000000..b9a2e887ec
--- /dev/null
+++ b/Dashboard/package.json
@@ -0,0 +1,61 @@
+{
+  "name": "akvo-flow",
+  "scripts": {
+    "build:dev": "babel-node ./scripts/buildDev.js",
+    "build:prod": "babel-node ./scripts/buildProd.js",
+    "lint": "esw webpack.config.* app/js/lib app/js/plugins scripts --color --ext jsx --ext js"
+  },
+  "dependencies": {
+    "babel-register": "^6.26.0",
+    "lodash": "^4.17.11",
+    "moment": "^2.24.0",
+    "react": "^16.8.4",
+    "react-dom": "^16.8.4"
+  },
+  "devDependencies": {
+    "autoprefixer": "^9.4.9",
+    "babel-cli": "^6.26.0",
+    "babel-core": "^6.26.3",
+    "babel-eslint": "^10.0.1",
+    "babel-jest": "^24.1.0",
+    "babel-loader": "^7.1.5",
+    "babel-plugin-transform-class-properties": "^6.24.1",
+    "babel-plugin-transform-es2015-for-of": "^6.23.0",
+    "babel-plugin-transform-react-constant-elements": "^6.23.0",
+    "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
+    "babel-polyfill": "^6.26.0",
+    "babel-preset-env": "^1.7.0",
+    "babel-preset-react": "^6.24.1",
+    "babel-preset-react-hmre": "^1.1.1",
+    "babel-preset-stage-2": "^6.24.1",
+    "chalk": "^2.4.2",
+    "copy-webpack-plugin": "^5.0.0",
+    "css-loader": "^2.1.0",
+    "eslint": "^5.14.1",
+    "eslint-config-airbnb": "^17.1.0",
+    "eslint-plugin-babel": "^5.3.0",
+    "eslint-plugin-import": "^2.16.0",
+    "eslint-plugin-jsx-a11y": "^6.2.1",
+    "eslint-plugin-react": "^7.12.4",
+    "eslint-watch": "^4.0.2",
+    "extract-text-webpack-plugin": "^4.0.0-beta.0",
+    "file-loader": "^3.0.1",
+    "handlebars-loader": "^1.7.1",
+    "html-webpack-plugin": "^3.2.0",
+    "husky": "^1.3.1",
+    "node-sass": "^4.11.0",
+    "postcss-loader": "^3.0.0",
+    "sass-loader": "^7.1.0",
+    "style-loader": "^0.23.1",
+    "text-loader": "0.0.1",
+    "url-loader": "^1.1.2",
+    "webpack": "^4.29.6",
+    "webpack-cli": "^3.2.3",
+    "webpack-md5-hash": "0.0.6"
+  },
+  "husky": {
+    "hooks": {
+      "post-merge": "npm install"
+    }
+  }
+}
diff --git a/Dashboard/scripts/buildDev.js b/Dashboard/scripts/buildDev.js
new file mode 100755
index 0000000000..94d43cc9c5
--- /dev/null
+++ b/Dashboard/scripts/buildDev.js
@@ -0,0 +1,68 @@
+/* eslint-disable no-console, import/no-extraneous-dependencies */
+import webpack from 'webpack';
+import config from '../webpack.config.dev';
+import publicConfig from '../webpack.config.public.dev';
+import {
+  chalkError, chalkSuccess, chalkWarning, chalkProcessing,
+} from './chalkConfig';
+
+process.env.NODE_ENV = 'development'; // this assures React is built in prod mode and that the Babel dev config doesn't apply.
+console.log(chalkProcessing('Generating bundle. This will take a moment...'));
+
+const publicCompiler = webpack(publicConfig);
+
+publicCompiler.watch({
+  aggregateTimeout: 300,
+  poll: undefined,
+}, (error, stats) => {
+  if (error) {
+    console.log(chalkError(error));
+    return 1;
+  }
+
+  const jsonStats = stats.toJson();
+
+  if (jsonStats.hasErrors) {
+    return jsonStats.errors.map(error2 => console.log(chalkError(error2)));
+  }
+
+  if (jsonStats.hasWarnings) {
+    console.log(chalkWarning('Webpack generated the following warnings: '));
+    jsonStats.warnings.map(warning => console.log(chalkWarning(warning)));
+  }
+
+  console.log(`Webpack stats: ${stats}`);
+
+  console.log(chalkSuccess('Public app is compiled. Now compiling dashboard app...'));
+
+  return 0;
+});
+
+const compiler = webpack(config);
+
+compiler.watch({
+  aggregateTimeout: 300,
+  poll: undefined,
+}, (error, stats) => {
+  if (error) {
+    console.log(chalkError(error));
+    return 1;
+  }
+
+  const jsonStats = stats.toJson();
+
+  if (jsonStats.hasErrors) {
+    return jsonStats.errors.map(error2 => console.log(chalkError(error2)));
+  }
+
+  if (jsonStats.hasWarnings) {
+    console.log(chalkWarning('Webpack generated the following warnings: '));
+    jsonStats.warnings.map(warning => console.log(chalkWarning(warning)));
+  }
+
+  console.log(`Webpack stats: ${stats}`);
+
+  console.log(chalkSuccess('The app is compiled and ready for development...'));
+
+  return 0;
+});
diff --git a/Dashboard/scripts/buildProd.js b/Dashboard/scripts/buildProd.js
new file mode 100755
index 0000000000..48f1205f76
--- /dev/null
+++ b/Dashboard/scripts/buildProd.js
@@ -0,0 +1,38 @@
+/* eslint-disable no-console, import/no-extraneous-dependencies */
+import webpack from 'webpack';
+import config from '../webpack.config.prod';
+import configPublic from '../webpack.config.public.prod';
+import { chalkError, chalkSuccess, chalkWarning, chalkProcessing } from './chalkConfig';
+
+process.env.NODE_ENV = 'production';
+console.log(chalkProcessing('Generating bundle. This will take a moment...'));
+
+const handler = (callback = () => {}) => (error, stats) => {
+  if (error) {
+    console.log(chalkError(error));
+    return 1;
+  }
+
+  const jsonStats = stats.toJson();
+
+  if (jsonStats.hasErrors) {
+    return jsonStats.errors.map(error2 => console.log(chalkError(error2)));
+  }
+
+  if (jsonStats.hasWarnings) {
+    console.log(chalkWarning('Webpack generated the following warnings: '));
+    jsonStats.warnings.map(warning => console.log(chalkWarning(warning)));
+  }
+
+  console.log(`Webpack stats: ${stats}`);
+
+  console.log(chalkSuccess('The app is compiled and ready for production...'));
+
+  callback();
+
+  return 0;
+};
+
+webpack(config).run(handler(() => {
+  webpack(configPublic).run(handler());
+}));
diff --git a/Dashboard/scripts/chalkConfig.js b/Dashboard/scripts/chalkConfig.js
new file mode 100755
index 0000000000..294945bf09
--- /dev/null
+++ b/Dashboard/scripts/chalkConfig.js
@@ -0,0 +1,7 @@
+// Centralized configuration for chalk, which is used to add color to console.log statements.
+import chalk from 'chalk';
+
+export const chalkError = chalk.red;
+export const chalkSuccess = chalk.green;
+export const chalkWarning = chalk.yellow;
+export const chalkProcessing = chalk.blue;
diff --git a/Dashboard/webpack.config.dev.js b/Dashboard/webpack.config.dev.js
new file mode 100755
index 0000000000..2165f69719
--- /dev/null
+++ b/Dashboard/webpack.config.dev.js
@@ -0,0 +1,165 @@
+/* eslint-disable global-require */
+import webpack from 'webpack';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
+import path from 'path';
+import CopyPlugin from 'copy-webpack-plugin';
+import { execSync } from 'child_process';
+
+export const HTML_CONFIG = {
+  minify: {
+    removeComments: true,
+    collapseWhitespace: true,
+  },
+  inject: 'body',
+};
+
+export default {
+  mode: 'development',
+  resolve: {
+    extensions: ['*', '.js', '.jsx', '.json', '.handlebars', '.scss'],
+    alias: {
+      'akvo-flow': path.resolve(__dirname, 'app/js/lib/'),
+      templates: path.resolve(__dirname, 'app/js/templates/'),
+    },
+  },
+  externals: {
+    'akvo-flow/flowenv': 'FLOW.Env',
+    'akvo-flow/currentuser': 'FLOW.currentUser',
+  },
+  devtool: 'cheap-module-eval-source-map', // more info:https://webpack.js.org/guides/development/#using-source-maps and https://webpack.js.org/configuration/devtool/
+  entry: {
+    admin: [
+      './app/js/lib/webpack-public-path', // must be first entry to properly set public path
+      path.resolve(__dirname, 'app/js/lib/main.js'), // Defining path seems necessary for this to work consistently on Windows machines.
+    ],
+  },
+  target: 'web',
+  output: {
+    path: path.resolve(__dirname, '../GAE/target/akvo-flow/admin'), // Note: Physical files are only output by the production build task `npm run build`.
+    filename: '[name].bundle.js',
+    publicPath: '/admin/',
+  },
+  plugins: [
+    new webpack.DefinePlugin({
+      'process.env.NODE_ENV': JSON.stringify('development'), // Tells React to build in either dev or prod modes. https://facebook.github.io/react/downloads.html (See bottom)
+      __DEV__: true,
+      __VERSION__: JSON.stringify(execSync('git describe').toString()),
+    }),
+
+    new HtmlWebpackPlugin({
+      ...HTML_CONFIG,
+      template: 'app/dashboard.ejs',
+      chunks: ['admin'],
+    }),
+
+    new CopyPlugin([
+      { from: 'app/js/plugins', to: 'js' },
+      { from: 'app/static/images', to: 'images' },
+    ]),
+  ],
+  module: {
+    rules: [
+      {
+        test: /\.jsx?$/,
+        exclude: /node_modules/,
+        use: ['babel-loader'],
+      },
+      {
+        test: /\.eot(\?v=\d+.\d+.\d+)?$/,
+        use: ['file-loader'],
+      },
+      {
+        test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+        use: [
+          {
+            loader: 'url-loader',
+            options: {
+              limit: 10000,
+              mimetype: 'application/font-woff',
+            },
+          },
+        ],
+      },
+      {
+        test: /\.[ot]tf(\?v=\d+.\d+.\d+)?$/,
+        use: [
+          {
+            loader: 'url-loader',
+            options: {
+              limit: 10000,
+              mimetype: 'application/octet-stream',
+            },
+          },
+        ],
+      },
+      {
+        test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
+        use: [
+          {
+            loader: 'url-loader',
+            options: {
+              limit: 10000,
+              mimetype: 'image/svg+xml',
+              outputPath: 'images',
+            },
+          },
+        ],
+      },
+      {
+        test: /\.(html)$/i,
+        use: [
+          {
+            loader: 'file-loader',
+            options: {
+              name: '[name].[ext]',
+            },
+          },
+        ],
+      },
+      {
+        test: /\.(jpe?g|png|gif|ico)$/i,
+        use: [
+          {
+            loader: 'file-loader',
+            options: {
+              name: '[name].[ext]',
+              outputPath: 'images',
+            },
+          },
+        ],
+      },
+      {
+        test: /(\.css|\.scss|\.sass)$/,
+        use: [
+          'style-loader',
+          {
+            loader: 'css-loader',
+            options: {
+              sourceMap: true,
+            },
+          },
+          {
+            loader: 'postcss-loader',
+            options: {
+              plugins: () => [
+                require('autoprefixer'),
+              ],
+              sourceMap: true,
+            },
+          },
+          {
+            loader: 'sass-loader',
+            options: {
+              includePaths: [path.resolve(__dirname, 'src', 'scss')],
+              sourceMap: true,
+            },
+          },
+        ],
+      },
+      {
+        test: /\.handlebars$/,
+        use: ['text-loader'],
+      },
+    ],
+  },
+};
diff --git a/Dashboard/webpack.config.prod.js b/Dashboard/webpack.config.prod.js
new file mode 100644
index 0000000000..87b201d54a
--- /dev/null
+++ b/Dashboard/webpack.config.prod.js
@@ -0,0 +1,164 @@
+import webpack from 'webpack';
+import ExtractTextPlugin from 'extract-text-webpack-plugin';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
+import CopyPlugin from 'copy-webpack-plugin';
+import path from 'path';
+import { execSync } from 'child_process';
+
+import devConfig from './webpack.config.dev';
+
+export const HTML_CONFIG = {
+  minify: {
+    removeComments: true,
+    collapseWhitespace: true,
+    removeRedundantAttributes: true,
+    useShortDoctype: true,
+    removeEmptyAttributes: true,
+    removeStyleLinkTypeAttributes: true,
+    keepClosingSlash: true,
+    minifyJS: true,
+    minifyCSS: true,
+    minifyURLs: true,
+  },
+  inject: 'body',
+  trackJSToken: '',
+};
+
+export default {
+  ...devConfig,
+  devtool: 'source-map', // more info:https://webpack.js.org/guides/production/#source-mapping and https://webpack.js.org/configuration/devtool/
+  plugins: [
+    // Tells React to build in prod mode. https://facebook.github.io/react/downloads.html
+    new webpack.DefinePlugin({
+      'process.env.NODE_ENV': JSON.stringify('production'),
+      __DEV__: false,
+      __VERSION__: JSON.stringify(execSync('git describe').toString()),
+    }),
+
+    // Generate an external css file with a hash in the filename
+    new ExtractTextPlugin({
+      filename: '[name].[md5:contenthash:hex:20].css',
+      allChunks: true,
+    }),
+
+    new HtmlWebpackPlugin({
+      ...HTML_CONFIG,
+      template: 'app/dashboard.ejs',
+      chunks: ['admin'],
+    }),
+
+    new webpack.optimize.ModuleConcatenationPlugin(),
+
+    new CopyPlugin([
+      { from: 'app/js/plugins', to: 'js' },
+      { from: 'app/static/images', to: 'images' },
+    ]),
+  ],
+
+  optimization: {
+    minimize: true,
+  },
+
+  module: {
+    rules: [
+      {
+        test: /\.jsx?$/,
+        exclude: /node_modules/,
+        use: ['babel-loader'],
+      },
+      {
+        test: /\.eot(\?v=\d+.\d+.\d+)?$/,
+        use: ['file-loader'],
+      },
+      {
+        test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+        use: [
+          {
+            loader: 'url-loader',
+            options: {
+              limit: 10000,
+              mimetype: 'application/font-woff',
+            },
+          },
+        ],
+      },
+      {
+        test: /\.[ot]tf(\?v=\d+.\d+.\d+)?$/,
+        use: [
+          {
+            loader: 'url-loader',
+            options: {
+              limit: 10000,
+              mimetype: 'application/octet-stream',
+            },
+          },
+        ],
+      },
+      {
+        test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
+        use: [
+          {
+            loader: 'url-loader',
+            options: {
+              limit: 10000,
+              mimetype: 'image/svg+xml',
+              outputPath: 'images',
+            },
+          },
+        ],
+      },
+      {
+        test: /\.(html)$/i,
+        use: [
+          {
+            loader: 'file-loader',
+            options: {
+              name: '[name].[ext]',
+            },
+          },
+        ],
+      },
+      {
+        test: /\.(jpe?g|png|gif|ico)$/i,
+        use: [
+          {
+            loader: 'file-loader',
+            options: {
+              name: '[name].[ext]',
+              outputPath: 'images',
+            },
+          },
+        ],
+      },
+      {
+        test: /(\.css|\.scss|\.sass)$/,
+        use: ExtractTextPlugin.extract({
+          fallback: 'style-loader',
+          use: [
+            {
+              loader: 'css-loader',
+            }, {
+              loader: 'postcss-loader',
+              options: {
+                plugins: () => [
+                  require('autoprefixer'),
+                ],
+                sourceMap: true,
+              },
+            }, {
+              loader: 'sass-loader',
+              options: {
+                includePaths: [path.resolve(__dirname, 'app', 'css')],
+                sourceMap: true,
+              },
+            },
+          ],
+        }),
+      },
+      {
+        test: /\.handlebars$/,
+        use: ['text-loader'],
+      },
+    ],
+  },
+};
diff --git a/Dashboard/webpack.config.public.dev.js b/Dashboard/webpack.config.public.dev.js
new file mode 100755
index 0000000000..8ebbb4907d
--- /dev/null
+++ b/Dashboard/webpack.config.public.dev.js
@@ -0,0 +1,160 @@
+/* eslint-disable global-require */
+import webpack from 'webpack';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
+import path from 'path';
+import CopyPlugin from 'copy-webpack-plugin';
+import { execSync } from 'child_process';
+
+import { HTML_CONFIG } from './webpack.config.dev';
+
+export default {
+  mode: 'development',
+  resolve: {
+    extensions: ['*', '.js', '.jsx', '.json', '.handlebars', '.scss'],
+    alias: {
+      'akvo-flow': path.resolve(__dirname, 'app/js/lib/'),
+      templates: path.resolve(__dirname, 'app/js/templates/'),
+    },
+  },
+  externals: {
+    'akvo-flow/flowenv': 'FLOW.Env',
+    'akvo-flow/currentuser': 'FLOW.currentUser',
+  },
+  devtool: 'cheap-module-eval-source-map', // more info:https://webpack.js.org/guides/development/#using-source-maps and https://webpack.js.org/configuration/devtool/
+  entry: {
+    pub: [
+      './app/js/lib/webpack-public-path', // must be first entry to properly set public path
+      path.resolve(__dirname, 'app/js/lib/main-public.js'),
+    ],
+  },
+  output: {
+    path: path.resolve(__dirname, '../GAE/target/akvo-flow/publicmap'), // Note: Physical files are only output by the production build task `npm run build`.
+    filename: '[name].bundle.js',
+    publicPath: '/publicmap/',
+  },
+  plugins: [
+    new webpack.DefinePlugin({
+      'process.env.NODE_ENV': JSON.stringify('development'), // Tells React to build in either dev or prod modes. https://facebook.github.io/react/downloads.html (See bottom)
+      __DEV__: true,
+      __VERSION__: JSON.stringify(execSync('git describe').toString()),
+    }),
+
+    new HtmlWebpackPlugin({
+      ...HTML_CONFIG,
+      template: 'app/public.ejs',
+      chunks: ['pub'],
+      filename: '../index.html',
+    }),
+
+    new CopyPlugin([
+      { from: 'app/js/plugins', to: 'js' },
+      { from: 'app/static/images', to: 'images' },
+      { from: 'app/css/custom-theme/images', to: 'images' },
+    ]),
+  ],
+  module: {
+    rules: [
+      {
+        test: /\.jsx?$/,
+        exclude: /node_modules/,
+        use: ['babel-loader'],
+      },
+      {
+        test: /\.eot(\?v=\d+.\d+.\d+)?$/,
+        use: ['file-loader'],
+      },
+      {
+        test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+        use: [
+          {
+            loader: 'url-loader',
+            options: {
+              limit: 10000,
+              mimetype: 'application/font-woff',
+            },
+          },
+        ],
+      },
+      {
+        test: /\.[ot]tf(\?v=\d+.\d+.\d+)?$/,
+        use: [
+          {
+            loader: 'url-loader',
+            options: {
+              limit: 10000,
+              mimetype: 'application/octet-stream',
+            },
+          },
+        ],
+      },
+      {
+        test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
+        use: [
+          {
+            loader: 'url-loader',
+            options: {
+              limit: 10000,
+              mimetype: 'image/svg+xml',
+              outputPath: 'images',
+            },
+          },
+        ],
+      },
+      {
+        test: /\.(html)$/i,
+        use: [
+          {
+            loader: 'file-loader',
+            options: {
+              name: '[name].[ext]',
+            },
+          },
+        ],
+      },
+      {
+        test: /\.(jpe?g|png|gif|ico)$/i,
+        use: [
+          {
+            loader: 'file-loader',
+            options: {
+              name: '[name].[ext]',
+              outputPath: 'images',
+            },
+          },
+        ],
+      },
+      {
+        test: /(\.css|\.scss|\.sass)$/,
+        use: [
+          'style-loader',
+          {
+            loader: 'css-loader',
+            options: {
+              sourceMap: true,
+            },
+          },
+          {
+            loader: 'postcss-loader',
+            options: {
+              plugins: () => [
+                require('autoprefixer'),
+              ],
+              sourceMap: true,
+            },
+          },
+          {
+            loader: 'sass-loader',
+            options: {
+              includePaths: [path.resolve(__dirname, 'src', 'scss')],
+              sourceMap: true,
+            },
+          },
+        ],
+      },
+      {
+        test: /\.handlebars$/,
+        use: ['text-loader'],
+      },
+    ],
+  },
+};
diff --git a/Dashboard/webpack.config.public.prod.js b/Dashboard/webpack.config.public.prod.js
new file mode 100755
index 0000000000..d36f751c5b
--- /dev/null
+++ b/Dashboard/webpack.config.public.prod.js
@@ -0,0 +1,150 @@
+import path from 'path';
+import webpack from 'webpack';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
+import { execSync } from 'child_process';
+import ExtractTextPlugin from 'extract-text-webpack-plugin';
+import CopyPlugin from 'copy-webpack-plugin';
+
+import devConfig from './webpack.config.public.dev';
+import { HTML_CONFIG } from './webpack.config.prod';
+
+export default {
+  ...devConfig,
+  devtool: 'source-map', // more info:https://webpack.js.org/guides/production/#source-mapping and https://webpack.js.org/configuration/devtool/
+  plugins: [
+    // Tells React to build in prod mode. https://facebook.github.io/react/downloads.html
+    new webpack.DefinePlugin({
+      'process.env.NODE_ENV': JSON.stringify('production'),
+      __DEV__: false,
+      __VERSION__: JSON.stringify(execSync('git describe').toString()),
+    }),
+
+    // Generate an external css file with a hash in the filename
+    new ExtractTextPlugin({
+      filename: '[name].[md5:contenthash:hex:20].css',
+      allChunks: true,
+    }),
+
+    new HtmlWebpackPlugin({
+      ...HTML_CONFIG,
+      template: 'app/public.ejs',
+      chunks: ['pub'],
+      filename: '../index.html',
+    }),
+
+    new CopyPlugin([
+      { from: 'app/js/plugins', to: 'js' },
+      { from: 'app/static/images', to: 'images' },
+      { from: 'app/css/custom-theme/images', to: 'images' },
+    ]),
+
+    new webpack.optimize.ModuleConcatenationPlugin(),
+  ],
+
+  optimization: {
+    minimize: true,
+  },
+
+  module: {
+    rules: [
+      {
+        test: /\.jsx?$/,
+        exclude: /node_modules/,
+        use: ['babel-loader'],
+      },
+      {
+        test: /\.eot(\?v=\d+.\d+.\d+)?$/,
+        use: ['file-loader'],
+      },
+      {
+        test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+        use: [
+          {
+            loader: 'url-loader',
+            options: {
+              limit: 10000,
+              mimetype: 'application/font-woff',
+            },
+          },
+        ],
+      },
+      {
+        test: /\.[ot]tf(\?v=\d+.\d+.\d+)?$/,
+        use: [
+          {
+            loader: 'url-loader',
+            options: {
+              limit: 10000,
+              mimetype: 'application/octet-stream',
+            },
+          },
+        ],
+      },
+      {
+        test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
+        use: [
+          {
+            loader: 'url-loader',
+            options: {
+              limit: 10000,
+              mimetype: 'image/svg+xml',
+              outputPath: 'images',
+            },
+          },
+        ],
+      },
+      {
+        test: /\.(html)$/i,
+        use: [
+          {
+            loader: 'file-loader',
+            options: {
+              name: '[name].[ext]',
+            },
+          },
+        ],
+      },
+      {
+        test: /\.(jpe?g|png|gif|ico)$/i,
+        use: [
+          {
+            loader: 'file-loader',
+            options: {
+              name: '[name].[ext]',
+              outputPath: 'images',
+            },
+          },
+        ],
+      },
+      {
+        test: /(\.css|\.scss|\.sass)$/,
+        use: ExtractTextPlugin.extract({
+          fallback: 'style-loader',
+          use: [
+            {
+              loader: 'css-loader',
+            }, {
+              loader: 'postcss-loader',
+              options: {
+                plugins: () => [
+                  require('autoprefixer'),
+                ],
+                sourceMap: true,
+              },
+            }, {
+              loader: 'sass-loader',
+              options: {
+                includePaths: [path.resolve(__dirname, 'app', 'css')],
+                sourceMap: true,
+              },
+            },
+          ],
+        }),
+      },
+      {
+        test: /\.handlebars$/,
+        use: ['text-loader'],
+      },
+    ],
+  },
+};
diff --git a/Dockerfile b/Dockerfile
index 28ebea9cfa..36a427fb31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,6 +30,7 @@ RUN set -ex ; \
     py-crcmod~=1.7 \
     py-openssl~=17.5 \
     maven~=3.5 \
+    nss~=3.34 \
     libc6-compat~=1.1 \
     su-exec~=0.2 \
     shadow~=4.5 \
diff --git a/GAE/pom.xml b/GAE/pom.xml
index 48482f3ae9..b167bcf0bf 100644
--- a/GAE/pom.xml
+++ b/GAE/pom.xml
@@ -39,9 +39,11 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.showDeprecation>false</maven.compiler.showDeprecation>
     <archiveClasses>true</archiveClasses>
-    <spring.version>3.2.18.RELEASE</spring.version>
-    <spring.security.version>3.2.10.RELEASE</spring.security.version>
+    <spring.version>4.3.22.RELEASE</spring.version>
+    <spring.security.version>4.2.11.RELEASE</spring.security.version>
     <appengine.sdk.version>1.9.63</appengine.sdk.version>
+    <jackson.version>[2.9.8]</jackson.version>
+    <junit.jupiter.version>5.4.0</junit.jupiter.version>
   </properties>
 
   <dependencies>
@@ -82,11 +84,6 @@
         <artifactId>datanucleus-api-jdo</artifactId>
         <version>3.1.3</version>
     </dependency>
-    <dependency>
-        <groupId>org.springframework.security</groupId>
-        <artifactId>spring-security-core</artifactId>
-        <version>${spring.security.version}</version>
-    </dependency>
     <dependency>
         <groupId>org.apache.velocity</groupId>
         <artifactId>velocity</artifactId>
@@ -122,7 +119,16 @@
         <artifactId>spring-context-support</artifactId>
         <version>${spring.version}</version>
     </dependency>
-
+    <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-expression</artifactId>
+        <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-webmvc</artifactId>
+        <version>${spring.version}</version>
+    </dependency>
     <dependency>
         <groupId>org.json</groupId>
         <artifactId>json</artifactId>
@@ -133,6 +139,11 @@
         <artifactId>poi</artifactId>
         <version>3.8</version>
     </dependency>
+    <dependency>
+        <groupId>org.springframework.security</groupId>
+        <artifactId>spring-security-core</artifactId>
+        <version>${spring.security.version}</version>
+    </dependency>
     <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-web</artifactId>
@@ -144,19 +155,19 @@
         <version>${spring.security.version}</version>
     </dependency>
     <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-expression</artifactId>
-        <version>${spring.security.version}</version>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-core</artifactId>
+        <version>${jackson.version}</version>
     </dependency>
     <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-webmvc</artifactId>
-        <version>${spring.version}</version>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>
+        <version>${jackson.version}</version>
     </dependency>
     <dependency>
-       <groupId>org.codehaus.jackson</groupId>
-       <artifactId>jackson-mapper-asl</artifactId>
-       <version>1.8.5</version>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-annotations</artifactId>
+        <version>${jackson.version}</version>
     </dependency>
     <dependency>
        <groupId>com.google.appengine</groupId>
@@ -179,11 +190,6 @@
         <artifactId>commons-beanutils</artifactId>
         <version>1.8.3</version>
     </dependency>
-    <dependency>
-        <groupId>commons-fileupload</groupId>
-        <artifactId>commons-fileupload</artifactId>
-        <version>1.2.1</version>
-    </dependency>
     <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
@@ -196,6 +202,21 @@
         <version>2.4</version>
     </dependency>
 
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>${junit.jupiter.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>${junit.jupiter.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- Will this work in place of version 1.0.13? -->
     <dependency>
         <groupId>org.jfree</groupId>
@@ -224,7 +245,6 @@
         <version>2.5.1</version>
         <scope>provided</scope>
     </dependency>
-
   </dependencies>
 
   <build>
@@ -346,7 +366,7 @@
 
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.20</version>
+        <version>2.22.1</version>
       </plugin>
 
       <plugin>
diff --git a/GAE/src/com/gallatinsystems/common/Constants.java b/GAE/src/com/gallatinsystems/common/Constants.java
index 9d146cb205..805a8817e4 100644
--- a/GAE/src/com/gallatinsystems/common/Constants.java
+++ b/GAE/src/com/gallatinsystems/common/Constants.java
@@ -27,6 +27,7 @@ public class Constants {
             "createUserId"
     };
     public static final int MAX_LENGTH = 500;
+    public static final int MAX_DS_STRING_LENGTH = 1500;
     public static final int CONNECTION_TIMEOUT = 60 * 1000; // 1min
     public static final int READ_TIMEOUT = 2 * 60 * 1000; // 2min
     public static final int TASK_RETRY_INTERVAL = 2 * 10 * 1000; // 2 mins
diff --git a/GAE/src/com/gallatinsystems/common/util/ZipUtil.java b/GAE/src/com/gallatinsystems/common/util/ZipUtil.java
index a6327e6152..f93152b0c2 100644
--- a/GAE/src/com/gallatinsystems/common/util/ZipUtil.java
+++ b/GAE/src/com/gallatinsystems/common/util/ZipUtil.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2012 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2012,2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -16,7 +16,6 @@
 
 package com.gallatinsystems.common.util;
 
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -106,49 +105,25 @@ public static ByteArrayOutputStream generateZip(Map<String, String> contents, Ma
         return bos;
     }
 
-    /**
-     * decodes the byte array representing the zip file into a string. This assumes the zip contains
-     * only 1 file.
-     * 
-     * @param contents
-     * @return
-     * @throws IOException
-     */
-    public static String unZip(byte[] contents) throws IOException {
-        return unZip(contents, null);
-    }
-
-    /**
-     * unzips a single zip entry (file within a zip) and returns the content as a string.
-     * 
-     * @param contents
-     * @param entryName
-     * @return
-     * @throws IOException
-     */
-    public static String unZip(byte[] contents, String entryName)
-            throws IOException {
-        ByteArrayInputStream zipContents = new ByteArrayInputStream(contents);
-        ZipInputStream zis = new ZipInputStream(zipContents);
-        ZipEntry entry;
+    public static String unZipFile(String entryName, ZipInputStream zis) throws IOException {
         StringBuilder line = new StringBuilder();
-        while ((entry = zis.getNextEntry()) != null) {
-            if (entryName == null
-                    || entryName.equalsIgnoreCase(entry.getName())) {
-                ByteArrayOutputStream out = new ByteArrayOutputStream();
-                byte[] buffer = new byte[2048];
-                int size;
-                while ((size = zis.read(buffer, 0, buffer.length)) != -1) {
-                    out.write(buffer, 0, size);
+        if (entryName != null) {
+            ZipEntry entry;
+            while ((entry = zis.getNextEntry()) != null) {
+                if (entryName.equalsIgnoreCase(entry.getName())) {
+                    ByteArrayOutputStream out = new ByteArrayOutputStream();
+                    byte[] buffer = new byte[2048];
+                    int size;
+                    while ((size = zis.read(buffer, 0, buffer.length)) != -1) {
+                        out.write(buffer, 0, size);
+                    }
+                    line.append(out.toString());
+                    out.close();
+                    break;
                 }
-                line.append(out.toString());
-
-                out.close();
             }
+            zis.closeEntry();
         }
-        zis.closeEntry();
-
         return line.toString();
     }
-
 }
diff --git a/GAE/src/com/gallatinsystems/device/dao/DeviceDAO.java b/GAE/src/com/gallatinsystems/device/dao/DeviceDAO.java
index 2f19c8ad14..c485afbd30 100644
--- a/GAE/src/com/gallatinsystems/device/dao/DeviceDAO.java
+++ b/GAE/src/com/gallatinsystems/device/dao/DeviceDAO.java
@@ -119,7 +119,7 @@ public void updateDevice(String phoneNumber, Double lat, Double lon,
         }
         save(d);
     }
-    
+
     /**
      * lists all devices where lastLocationBeaconTime is older than a specific date
      */
diff --git a/GAE/src/com/gallatinsystems/framework/gwt/dto/client/BaseDto.java b/GAE/src/com/gallatinsystems/framework/gwt/dto/client/BaseDto.java
index 646e0a67d1..29821550c6 100644
--- a/GAE/src/com/gallatinsystems/framework/gwt/dto/client/BaseDto.java
+++ b/GAE/src/com/gallatinsystems/framework/gwt/dto/client/BaseDto.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2014 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2014,2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -16,6 +16,8 @@
 
 package com.gallatinsystems.framework.gwt.dto.client;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.io.Serializable;
 
 /**
@@ -23,6 +25,7 @@
  *
  * @author Christopher Fagaini
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class BaseDto implements Serializable {
 
     private static final long serialVersionUID = -5905705837362187943L;
diff --git a/GAE/src/com/gallatinsystems/messaging/domain/Message.java b/GAE/src/com/gallatinsystems/messaging/domain/Message.java
index 7ec3998d66..9fe85bf306 100644
--- a/GAE/src/com/gallatinsystems/messaging/domain/Message.java
+++ b/GAE/src/com/gallatinsystems/messaging/domain/Message.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2012 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2012, 2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -95,8 +95,15 @@ public String getShortMessage() {
         return shortMessage;
     }
 
+    //Max 1500 chars
+    //TODO If the UI displayed the long msg instead if it exists, we should clear shortMessage.
     public void setShortMessage(String shortMessage) {
-        this.shortMessage = shortMessage;
+        if (shortMessage.length() > 1500) {
+            setMessage(shortMessage);
+            this.shortMessage = shortMessage.substring(0, 1495) + " ...";
+        } else {
+            this.shortMessage = shortMessage;
+        }
     }
 
 }
diff --git a/GAE/src/com/gallatinsystems/operations/dao/ProcessingStatusDao.java b/GAE/src/com/gallatinsystems/operations/dao/ProcessingStatusDao.java
index e96dab5550..c02f3596ef 100644
--- a/GAE/src/com/gallatinsystems/operations/dao/ProcessingStatusDao.java
+++ b/GAE/src/com/gallatinsystems/operations/dao/ProcessingStatusDao.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2012 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2012, 2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -21,8 +21,6 @@
 
 /**
  * data access object for the processing status domain
- * 
- * @author Christopher Fagiani
  */
 public class ProcessingStatusDao extends BaseDAO<ProcessingStatus> {
 
@@ -40,4 +38,21 @@ public ProcessingStatus getStatusByCode(String code) {
         return findByProperty("code", code, "String");
     }
 
+    /**
+     * returns a single ProcessingStatus object, creating it if it does not exist
+     * 
+     * @param code
+     * @return
+     */
+    public ProcessingStatus getOrCreateStatusByCode(String code) {
+        ProcessingStatus status = getStatusByCode(code);
+        if (status == null) {
+            status = new ProcessingStatus();
+            status.setCode(code);
+        }
+        if (status.getMaxDurationMs() == null) {
+            status.setMaxDurationMs(0L);            
+        }
+        return status;
+    }
 }
diff --git a/GAE/src/com/gallatinsystems/operations/domain/ProcessingStatus.java b/GAE/src/com/gallatinsystems/operations/domain/ProcessingStatus.java
index aa3ed3391d..0d4c4faeb9 100644
--- a/GAE/src/com/gallatinsystems/operations/domain/ProcessingStatus.java
+++ b/GAE/src/com/gallatinsystems/operations/domain/ProcessingStatus.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2012 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2012, 2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -23,10 +23,9 @@
 import com.gallatinsystems.framework.domain.BaseDomain;
 
 /**
- * Domain that can be used to track processing status for use in computing last-run times and
- * progress of backend jobs.
+ * Domain that can be used to track processing status for use in computing
+ * last-run times, duration and progress of lengthy tasks.
  * 
- * @author Christopher Fagiani
  */
 @PersistenceCapable
 public class ProcessingStatus extends BaseDomain {
@@ -36,7 +35,10 @@ public class ProcessingStatus extends BaseDomain {
     private String value;
     private String guid;
     private Boolean inError;
-
+    private Date lastEventDate;
+    private Date maxDurationDate;
+    private Long maxDurationMs;
+    
     public Boolean getInError() {
         return inError;
     }
@@ -53,8 +55,6 @@ public void setLastEventDate(Date lastEventDate) {
         this.lastEventDate = lastEventDate;
     }
 
-    private Date lastEventDate;
-
     public String getGuid() {
         return guid;
     }
@@ -79,4 +79,20 @@ public void setValue(String value) {
         this.value = value;
     }
 
+    public Date getMaxDurationDate() {
+        return maxDurationDate;
+    }
+
+    public void setMaxDurationDate(Date maxDurationDate) {
+        this.maxDurationDate = maxDurationDate;
+    }
+
+    public Long getMaxDurationMs() {
+        return maxDurationMs;
+    }
+
+    public void setMaxDurationMs(Long maxDuration) {
+        this.maxDurationMs = maxDuration;
+    }
+
 }
diff --git a/GAE/src/com/gallatinsystems/survey/dao/CaddisflyResourceDao.java b/GAE/src/com/gallatinsystems/survey/dao/CaddisflyResourceDao.java
index cbb1928f34..d9a2104b85 100644
--- a/GAE/src/com/gallatinsystems/survey/dao/CaddisflyResourceDao.java
+++ b/GAE/src/com/gallatinsystems/survey/dao/CaddisflyResourceDao.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2016-2017 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2016-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -16,16 +16,15 @@
 
 package com.gallatinsystems.survey.dao;
 
-import java.io.InputStream;
 import java.net.URL;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.akvo.flow.util.FlowJsonObjectReader;
 import org.waterforpeople.mapping.domain.CaddisflyResource;
 
 /**
@@ -33,7 +32,6 @@
  * consists of only a single method.
  */
 public class CaddisflyResourceDao {
-    private static ObjectMapper mapper = new ObjectMapper();
 
     public static String DEFAULT_CADDISFLY_TESTS_FILE_URL = "https://akvoflow-public.s3.amazonaws.com/caddisfly-tests.json";
 
@@ -41,25 +39,19 @@ public class CaddisflyResourceDao {
             .getName());
 
     public List<CaddisflyResource> listResources(String caddisflyTestsUrl) {
-        List<CaddisflyResource> result = null;
+        Map<String, List<CaddisflyResource>> testsMap = null;
+        FlowJsonObjectReader jsonReader = new FlowJsonObjectReader();
 
         try {
             URL caddisflyFileUrl = new URL(caddisflyTestsUrl);
-            InputStream stream = caddisflyFileUrl.openStream();
-
-            // create a list of caddisflyResource objects
-            JsonNode rootNode = mapper.readTree(stream);
-            result = mapper.readValue(rootNode.get("tests"),
-                    new TypeReference<List<CaddisflyResource>>() {
-                    });
-
+            testsMap = jsonReader.readObject(caddisflyFileUrl, new TypeReference<Map<String, List<CaddisflyResource>>>() {});
         } catch (Exception e) {
             log.log(Level.SEVERE,
                     "Error parsing Caddisfly resource: " + e.getMessage(), e);
         }
 
-        if (result != null) {
-            return result;
+        if (testsMap != null && testsMap.get("tests") != null) {
+            return testsMap.get("tests");
         } else {
             return Collections.emptyList();
         }
diff --git a/GAE/src/com/gallatinsystems/survey/dao/CascadeNodeDao.java b/GAE/src/com/gallatinsystems/survey/dao/CascadeNodeDao.java
index 760b9feddf..dbd6509fc9 100644
--- a/GAE/src/com/gallatinsystems/survey/dao/CascadeNodeDao.java
+++ b/GAE/src/com/gallatinsystems/survey/dao/CascadeNodeDao.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2015 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2014-2015,2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -19,20 +19,15 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.jdo.PersistenceManager;
 
-import org.waterforpeople.mapping.app.web.dto.DataProcessorRequest;
+import org.waterforpeople.mapping.app.web.DataProcessorRestServlet;
 
 import com.gallatinsystems.framework.dao.BaseDAO;
 import com.gallatinsystems.framework.servlet.PersistenceFilter;
 import com.gallatinsystems.survey.domain.CascadeNode;
-import com.google.appengine.api.backends.BackendServiceFactory;
-import com.google.appengine.api.taskqueue.Queue;
-import com.google.appengine.api.taskqueue.QueueFactory;
-import com.google.appengine.api.taskqueue.TaskOptions;
 
 /**
  * Dao for manipulating CascadeResources
@@ -78,30 +73,12 @@ public List<CascadeNode> listCascadeNodesByResourceAndParentId(Long cascadeResou
     }
 
     public void deleteRecursive(Long cascadeResourceId, Long nodeId) {
-        CascadeNode cr = getByKey(nodeId);
-        if (cr == null) {
+        CascadeNode node = getByKey(nodeId);
+        if (node == null) {
             return;
         }
-        try {
-            final TaskOptions options = TaskOptions.Builder
-                    .withUrl("/app_worker/dataprocessor")
-                    .header("Host",
-                            BackendServiceFactory.getBackendService()
-                                    .getBackendAddress("dataprocessor"))
-                    .param(DataProcessorRequest.ACTION_PARAM,
-                            DataProcessorRequest.DELETE_CASCADE_NODES)
-                    .param(DataProcessorRequest.CASCADE_RESOURCE_ID,
-                            cascadeResourceId.toString())
-                    .param(DataProcessorRequest.PARENT_NODE_ID, nodeId.toString());
-            final Queue queue = QueueFactory.getQueue("background-processing");
-            queue.add(options);
-        } catch (Exception e) {
-            log.log(Level.SEVERE,
-                    String.format(
-                            "Error scheduling Cascade Node deletion - cascadeResourceId: %s - parentNodeId: %s",
-                            cascadeResourceId, nodeId), e);
-        }
-        delete(cr);
+        DataProcessorRestServlet.scheduleChildCascadeNodeDeletion(node.getCascadeResourceId(), nodeId);
+        delete(node);
     }
 
     @SuppressWarnings("unchecked")
diff --git a/GAE/src/com/gallatinsystems/survey/dao/CascadeResourceDao.java b/GAE/src/com/gallatinsystems/survey/dao/CascadeResourceDao.java
index c547370663..be4330e215 100644
--- a/GAE/src/com/gallatinsystems/survey/dao/CascadeResourceDao.java
+++ b/GAE/src/com/gallatinsystems/survey/dao/CascadeResourceDao.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2014,2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -16,17 +16,12 @@
 
 package com.gallatinsystems.survey.dao;
 
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.waterforpeople.mapping.app.web.dto.DataProcessorRequest;
+import org.waterforpeople.mapping.app.web.DataProcessorRestServlet;
 
 import com.gallatinsystems.framework.dao.BaseDAO;
 import com.gallatinsystems.survey.domain.CascadeResource;
-import com.google.appengine.api.backends.BackendServiceFactory;
-import com.google.appengine.api.taskqueue.Queue;
-import com.google.appengine.api.taskqueue.QueueFactory;
-import com.google.appengine.api.taskqueue.TaskOptions;
 
 /**
  * Dao for manipulating CascadeResources
@@ -43,30 +38,15 @@ public CascadeResourceDao() {
     /**
      * deletes a cascade resource, and the nodes therein asynchronously in a task
      * 
-     * @param item
+     * @param resource
      */
-    public void delete(CascadeResource item) {
-        if (item == null) {
+    public void delete(CascadeResource resource) {
+        if (resource == null) {
             return;
         }
 
-        try {
+        super.delete(resource);
 
-            super.delete(item);
-
-            final Long keyId = item.getKey().getId();
-            final TaskOptions options = TaskOptions.Builder
-                    .withUrl("/app_worker/dataprocessor")
-                    .header("Host",
-                            BackendServiceFactory.getBackendService()
-                                    .getBackendAddress("dataprocessor"))
-                    .param(DataProcessorRequest.ACTION_PARAM,
-                            DataProcessorRequest.DELETE_CASCADE_NODES)
-                    .param(DataProcessorRequest.CASCADE_RESOURCE_ID, keyId.toString());
-            final Queue queue = QueueFactory.getQueue("background-processing");
-            queue.add(options);
-        } catch (Exception e) {
-            log.log(Level.SEVERE, "Error deleting Cascade Resource: " + e.getMessage(), e);
-        }
+        DataProcessorRestServlet.scheduleCascadeResourceDeletion(resource.getKey().getId());
     }
 }
\ No newline at end of file
diff --git a/GAE/src/com/gallatinsystems/survey/dao/QuestionDao.java b/GAE/src/com/gallatinsystems/survey/dao/QuestionDao.java
index fd131347c3..c5d8ca303c 100644
--- a/GAE/src/com/gallatinsystems/survey/dao/QuestionDao.java
+++ b/GAE/src/com/gallatinsystems/survey/dao/QuestionDao.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2018 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -564,7 +564,7 @@ public List<Question> listQuestionsByQuestionGroupOrderByCreatedDateTime(Long qu
     /**
      * lists questions within a group. If needDetails flag is true, the child objects will be loaded
      * for each question. Due to processing constraints on GAE, needDetails should only be true when
-     * calling this method if being called from a backend or task.
+     * calling this method from a task.
      *
      * @param questionGroupId
      * @param needDetails
@@ -578,7 +578,7 @@ public TreeMap<Integer, Question> listQuestionsByQuestionGroup(
     /**
      * lists all the questions in a group, optionally loading details. If allowSideEffects is true,
      * it will attempt to reorder any duplicated question orderings on retrieval. New users of this
-     * method should ALWAY call this with allowSideEffects = false
+     * method should ALWAYS call this with allowSideEffects = false
      *
      * @param questionGroupId
      * @param needDetails
@@ -587,8 +587,8 @@ public TreeMap<Integer, Question> listQuestionsByQuestionGroup(
      */
     public TreeMap<Integer, Question> listQuestionsByQuestionGroup(
             Long questionGroupId, boolean needDetails, boolean allowSideEffects) {
-        List<Question> qList = listByProperty("questionGroupId",
-                questionGroupId, "Long", "order", "asc");
+        List<Question> qList =
+                listByProperty("questionGroupId", questionGroupId, "Long", "order", "asc");
         TreeMap<Integer, Question> map = new TreeMap<Integer, Question>();
         if (qList != null) {
             for (Question q : qList) {
@@ -601,16 +601,9 @@ public TreeMap<Integer, Question> listQuestionsByQuestionGroup(
                     }
                     q.setTranslationMap(translationDao.findTranslations(
                             ParentType.QUESTION_TEXT, q.getKey().getId()));
-                    // only load scoring rules for types that support
-                    // scoring
-                    if (Question.Type.OPTION == q.getType()
-                            || Question.Type.FREE_TEXT == q.getType()
-                            || Question.Type.NUMBER == q.getType()) {
-                        q.setScoringRules(scoringRuleDao.listRulesByQuestion(q.getKey().getId()));
-                    }
                 }
                 if (q.getOrder() == null) {
-                    q.setOrder(qList.size() + 1); //Anything, temporarily
+                    q.setOrder(qList.size() + 1); //Anything, temporarily, to make a useable list
                 } else if (allowSideEffects) {
                     if (q.getOrder() != map.size() + 1) { //Not next in sequence
                         log.log(Level.WARNING, "Reordering question in group " + questionGroupId
diff --git a/GAE/src/com/gallatinsystems/survey/dao/SurveyAssignmentDAO.java b/GAE/src/com/gallatinsystems/survey/dao/SurveyAssignmentDAO.java
index ec26cf7a19..14b371e063 100644
--- a/GAE/src/com/gallatinsystems/survey/dao/SurveyAssignmentDAO.java
+++ b/GAE/src/com/gallatinsystems/survey/dao/SurveyAssignmentDAO.java
@@ -27,7 +27,6 @@ public class SurveyAssignmentDAO extends BaseDAO<SurveyAssignment> {
     public SurveyAssignmentDAO() {
         super(SurveyAssignment.class);
     }
-    
 
     /**
      * Return a list of survey assignments containing a specified device
@@ -35,7 +34,7 @@ public SurveyAssignmentDAO() {
      * @return list of assignments
      */
     public List<SurveyAssignment> listAllContainingDevice(Long devId) {
-    	List<SurveyAssignment> selected = listByProperty("deviceIds", devId, "Long");
+        List<SurveyAssignment> selected = listByProperty("deviceIds", devId, "Long");
         return selected;
     }
 
@@ -45,12 +44,12 @@ public List<SurveyAssignment> listAllContainingDevice(Long devId) {
      * @return number of affected assignments
      */
     public int removeDevice(Long devId) {
-    	List<SurveyAssignment> all = listAllContainingDevice(devId);
-    	for (SurveyAssignment ass : all) {
-    		List<Long> devs = ass.getDeviceIds();
-    		devs.remove(devId);
-    	}
-    	save(all);
+        List<SurveyAssignment> all = listAllContainingDevice(devId);
+        for (SurveyAssignment ass : all) {
+            List<Long> devs = ass.getDeviceIds();
+            devs.remove(devId);
+        }
+        save(all);
         return all.size();
     }
 }
diff --git a/GAE/src/com/gallatinsystems/survey/dao/SurveyUtils.java b/GAE/src/com/gallatinsystems/survey/dao/SurveyUtils.java
index 777faf72a1..91b6eab98c 100644
--- a/GAE/src/com/gallatinsystems/survey/dao/SurveyUtils.java
+++ b/GAE/src/com/gallatinsystems/survey/dao/SurveyUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2013-2018 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2013-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -53,10 +53,7 @@
 import com.google.appengine.api.taskqueue.QueueFactory;
 import com.google.appengine.api.taskqueue.TaskOptions;
 
-/**
- * @author stellan
- *
- */
+
 public class SurveyUtils {
 
     private static final Logger log = Logger.getLogger(SurveyUtils.class.getName());
@@ -96,10 +93,7 @@ public static Survey copySurvey(Survey source, SurveyDto dto) {
                 .param(DataProcessorRequest.SURVEY_ID_PARAM,
                         String.valueOf(newSurvey.getKey().getId()))
                 .param(DataProcessorRequest.SOURCE_PARAM,
-                        String.valueOf(source.getKey().getId()))
-                .header("Host",
-                        BackendServiceFactory.getBackendService()
-                                .getBackendAddress("dataprocessor"));
+                        String.valueOf(source.getKey().getId()));
 
         queue.add(options);
 
diff --git a/GAE/src/com/gallatinsystems/user/app/gwt/client/PermissionConstants.java b/GAE/src/com/gallatinsystems/user/app/gwt/client/PermissionConstants.java
deleted file mode 100644
index f44b837758..0000000000
--- a/GAE/src/com/gallatinsystems/user/app/gwt/client/PermissionConstants.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (C) 2010-2012 Stichting Akvo (Akvo Foundation)
- *
- *  This file is part of Akvo FLOW.
- *
- *  Akvo FLOW is free software: you can redistribute it and modify it under the terms of
- *  the GNU Affero General Public License (AGPL) as published by the Free Software Foundation,
- *  either version 3 of the License or any later version.
- *
- *  Akvo FLOW is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *  See the GNU Affero General Public License included below for more details.
- *
- *  The full license text can also be seen at <http://www.gnu.org/licenses/agpl.html>.
- */
-
-package com.gallatinsystems.user.app.gwt.client;
-
-/**
- * constants to be used as permissions
- * 
- * @author Christopher Fagiani TODO: relocate this
- */
-public class PermissionConstants {
-
-    public static final String EDIT_SURVEY = "EDIT SURVEY";
-    public static final String EDIT_AP = "EDIT ACCESS POINT";
-    public static final String EDIT_USER = "EDIT USERS";
-    public static final String EDIT_EDITORIAL = "EDIT EDITORIAL CONTENT";
-    public static final String IMPORT_SURVEY_DATA = "IMPORT SURVEY DATA";
-    public static final String IMPORT_AP_DATA = "IMPORT ACCESS POINT DATA";
-    public static final String UPLOAD_SURVEY_DATA = "UPLOAD SURVEY DATA";
-    public static final String PUBLISH_SURVEY = "PUBLISH SURVEY";
-    public static final String RAW_DATA_EDIT = "EDIT RAW DATA";
-    public static final String RUN_REPORTS = "RUN REPORTS";
-    public static final String IMPORT_DATA = "IMPORT DATA";
-    public static final String EDIT_TOKENS = "EDIT TOKENS";
-    public static final String VIEW_MESSAGES = "VIEW MESSAGES";
-    public static final String EDIT_IMMUTABLITY = "EDIT IMMUTABILITY";
-    public static final String ADMIN = "ADMIN";
-    public static final String SUPER_ADMIN = "SUPER_ADMIN";
-}
diff --git a/GAE/src/com/gallatinsystems/user/app/gwt/client/UserDto.java b/GAE/src/com/gallatinsystems/user/app/gwt/client/UserDto.java
index c5f5f64984..8d8497ca80 100644
--- a/GAE/src/com/gallatinsystems/user/app/gwt/client/UserDto.java
+++ b/GAE/src/com/gallatinsystems/user/app/gwt/client/UserDto.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2016 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2016,2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -50,11 +50,6 @@ public void setPermissionList(String permissionList) {
         this.permissionList = permissionList;
     }
 
-    public boolean isAdmin() {
-
-        return hasPermission(PermissionConstants.ADMIN);
-    }
-
     public boolean isSuperAdmin() {
         return superAdmin;
     }
@@ -63,10 +58,6 @@ public void setSuperAdmin(boolean isSuper) {
         this.superAdmin = isSuper;
     }
 
-    public void setAdmin(boolean isAdmin) {
-        this.admin = isAdmin;
-    }
-
     public boolean hasAccess() {
         return hasAccess;
     }
@@ -107,20 +98,6 @@ public void setEmailAddress(String emailAddress) {
         this.emailAddress = emailAddress;
     }
 
-    public boolean hasPermission(String permission) {
-        if (admin) {
-            // admins automatically get all permissions
-            return true;
-        } else {
-            if (permissionList != null) {
-                return (permissionList.contains(permission) || permissionList
-                        .contains(PermissionConstants.ADMIN));
-            } else {
-                return false;
-            }
-        }
-    }
-
     public String getAccessKey() {
         return accessKey;
     }
diff --git a/GAE/src/locale/en.properties b/GAE/src/locale/en.properties
index a69bd8512e..adb617a474 100644
--- a/GAE/src/locale/en.properties
+++ b/GAE/src/locale/en.properties
@@ -268,6 +268,7 @@ Mandatory = Mandatory
 Manual\ survey\ transfer = Manual survey transfer
 Maps = Maps
 Master\ language = Master language
+Maximum\ allowed\ characters\ for\ option = Maximum allowed characters for option
 Maximum\ value = Maximum value
 Message = Message
 Messages = Messages
@@ -279,12 +280,13 @@ Missing\ date = Missing date
 Modified = Modified
 Monitoring = Monitoring
 Most\ recent\ submissions = Most recent submissions
-Move = Move
+Move\ down = Move down
 Move\ group\ here = Move group here
 Move\ here = Move here
 Move\ left = Move left
 Move\ question\ here = Move question here
 Move\ right = Move right
+Move\ up = Move up
 Moving = Moving
 Name = Name
 New\ approval\ group = New approval group
@@ -418,9 +420,11 @@ Select\ all = Select all
 Select\ an\ existing\ cascade = Select an existing cascade
 Select\ an\ existing\ translation\ or\ add\ a\ new\ one = Select an existing translation or add a new one
 Select\ attribute\ type = Select attribute type
+Select\ brand = Select brand
 Select\ cascade = Select cascade
 Select\ chart\ type = Select chart type
 Select\ country = Select country
+Select\ details = Select details
 Select\ device\ group = Select device group
 Select\ devices = Select devices
 Select\ event = Select event
@@ -429,8 +433,10 @@ Select\ form = Select form
 Select\ forms = Select forms
 Select\ language = Select language
 Select\ metric = Select metric
+Select\ parameter = Select parameter
 Select\ option = Select option
 Select\ question = Select question
+Select\ sample = Select sample
 Select\ sublevel\ 1 = Select sublevel 1
 Select\ sublevel\ 2 = Select sublevel 2
 Select\ survey = Select survey
diff --git a/GAE/src/locale/ui-strings.properties b/GAE/src/locale/ui-strings.properties
index 544947cee3..b41439f037 100644
--- a/GAE/src/locale/ui-strings.properties
+++ b/GAE/src/locale/ui-strings.properties
@@ -303,11 +303,13 @@ _missing_option_text = Options are not defined for these codes
 _modified = Modified
 _monitoring = Monitoring
 _move = Move
+_move_down = Move down
 _move_group_here = Move group here
 _move_here = Move here
 _move_left = Move left
 _move_question_here = Move question here
 _move_right = Move right
+_move_up = Move up
 _moving = Moving
 _name = Name
 _new_approval_group = New approval group
@@ -349,6 +351,7 @@ _only_recent_submissions = Most recent submissions
 _open_photo = Open photo
 _open_video = Open video
 _option = Option
+_option_max_length = Maximum allowed characters for option
 _optional = Optional
 _options = Options
 _ordered = Ordered
@@ -451,6 +454,10 @@ _select_all = Select all
 _select_an_existing_translation_ = Select an existing translation or add a new one
 _select_attribute_type = Select attribute type
 _select_caddisfly_test = Select test
+_select_caddisfly_test_brand = Select brand
+_select_caddisfly_test_details = Select details
+_select_caddisfly_test_name = Select parameter
+_select_caddisfly_test_sample = Select sample
 _select_cascade = Select cascade
 _select_chart_type = Select chart type
 _select_country = Select country
diff --git a/GAE/src/org/akvo/flow/domain/DataUtils.java b/GAE/src/org/akvo/flow/domain/DataUtils.java
index 23b8d356ef..83d02b4651 100644
--- a/GAE/src/org/akvo/flow/domain/DataUtils.java
+++ b/GAE/src/org/akvo/flow/domain/DataUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2015-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -18,13 +18,12 @@
 
 import java.io.IOException;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.akvo.flow.util.FlowJsonObjectReader;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
 
 /**
  * Utilities class for performing transformations on survey data, i.e. response values
@@ -33,8 +32,6 @@ public class DataUtils {
 
     private static final Logger log = Logger.getLogger(DataUtils.class);
 
-    public static final ObjectMapper JSON_OBJECT_MAPPER = new ObjectMapper();
-
     public static String[] optionResponsesTextArray(String optionResponse) {
         String[] responseArray = null;
 
@@ -84,7 +81,7 @@ public static String[] cascadeResponseValues(String data) {
     /**
      * Convert a JSON string response for OPTION type questions to the legacy pipe separated format
      *
-     * @param jsonResponse
+     * @param optionResponses
      * @return
      */
     public static String jsonResponsesToPipeSeparated(String optionResponses) {
@@ -106,15 +103,16 @@ public static String jsonResponsesToPipeSeparated(String optionResponses) {
     }
 
     /**
-     * Convert a JSON string response to a list containing corresponding maps
+     * Convert a JSON string response to a list of corresponding maps
      *
      * @param data String containing the JSON-formatted response
      * @return List of maps with response properties
      */
     public static List<Map<String, String>> jsonStringToList(String data) {
+        FlowJsonObjectReader jsonReader = new FlowJsonObjectReader();
+        TypeReference<List<Map<String, String>>> typeReference = new TypeReference<List<Map<String, String>>>() {};
         try {
-            return JSON_OBJECT_MAPPER.readValue(data,
-                    new TypeReference<List<Map<String, String>>>() {});
+            return jsonReader.readObject(data, typeReference);
         } catch (IOException e) {
             // Data is not JSON-formatted
         }
@@ -124,23 +122,23 @@ public static List<Map<String, String>> jsonStringToList(String data) {
 
     /**
      * Process the JSON formatted string value of a signature question and return the string
-     * representing the signatory. A blank string is returned
+     * representing the signatory.
      *
      * @param value
      * @return
      */
     public static String parseSignatory(String value) {
-        String signatory = null;
+        FlowJsonObjectReader jsonReader = new FlowJsonObjectReader();
         Map<String, String> signatureResponse = null;
+        TypeReference<Map<String, String>> typeReference = new TypeReference<Map<String, String>>() {};
+
         try {
-            signatureResponse = JSON_OBJECT_MAPPER.readValue(value,
-                    new TypeReference<Map<String, String>>() {
-                    });
-            signatory = signatureResponse.get("name");
+            signatureResponse = jsonReader.readObject(value, typeReference);
         } catch (IOException e) {
             // ignore
         }
-        return signatory;
+
+        return signatureResponse.get("name");
     }
 
     /**
@@ -151,9 +149,12 @@ public static String parseSignatory(String value) {
      */
     @SuppressWarnings("unchecked")
     public static Map<String, Object> parseCaddisflyResponseValue(String caddisflyValue) {
-        Map<String, Object> caddisflyResponseMap = new HashMap<>();
+        Map<String, Object> caddisflyResponseMap = null;
+        FlowJsonObjectReader jsonReader = new FlowJsonObjectReader();
+        TypeReference<Map<String, Object>> typeReference = new TypeReference<Map<String, Object>>() {};
+
         try {
-            caddisflyResponseMap = JSON_OBJECT_MAPPER.readValue(caddisflyValue, Map.class);
+            caddisflyResponseMap = jsonReader.readObject(caddisflyValue, typeReference);
         } catch (IOException e) {
             log.warn("Failed to parse the caddisfly response");
         }
diff --git a/GAE/src/org/akvo/flow/events/EventLogger.java b/GAE/src/org/akvo/flow/events/EventLogger.java
index cbf3664853..e0c2c38506 100644
--- a/GAE/src/org/akvo/flow/events/EventLogger.java
+++ b/GAE/src/org/akvo/flow/events/EventLogger.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2015,2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -25,8 +25,6 @@
 import static org.akvo.flow.events.EventUtils.populateEntityProperties;
 
 import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.StringWriter;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -42,11 +40,10 @@
 import org.akvo.flow.events.EventUtils.EventTypes;
 import org.akvo.flow.events.EventUtils.Key;
 import org.akvo.flow.events.EventUtils.Prop;
-import org.codehaus.jackson.map.ObjectMapper;
+import org.akvo.flow.util.FlowJsonObjectWriter;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 
-import com.gallatinsystems.common.Constants;
 import com.gallatinsystems.common.util.PropertyUtil;
 import com.google.appengine.api.datastore.DatastoreService;
 import com.google.appengine.api.datastore.DatastoreServiceFactory;
@@ -55,7 +52,6 @@
 import com.google.appengine.api.datastore.PostDelete;
 import com.google.appengine.api.datastore.PostPut;
 import com.google.appengine.api.datastore.PutContext;
-import com.google.appengine.api.datastore.Text;
 import com.google.appengine.api.utils.SystemProperty;
 
 public class EventLogger {
@@ -82,14 +78,14 @@ private void sendNotification() {
             messageMap.put(Key.APP_ID, appId);
             messageMap.put(Key.URL, appId + ".appspot.com");
 
-            ObjectMapper m = new ObjectMapper();
-            OutputStreamWriter writer = new OutputStreamWriter(connection.getOutputStream());
-            m.writeValue(writer, messageMap);
-            writer.close();
+            FlowJsonObjectWriter writer = new FlowJsonObjectWriter();
+            writer.writeValue(connection.getOutputStream(), messageMap);
+
             if (connection.getResponseCode() != HttpURLConnection.HTTP_NO_CONTENT) {
                 logger.log(Level.SEVERE, "Unified log notification failed with status code: "
                         + connection.getResponseCode());
             }
+            connection.disconnect();
         } catch (MalformedURLException e) {
             logger.log(Level.SEVERE,
                     "Unified log notification failed with malformed URL exception", e);
@@ -133,20 +129,7 @@ private void storeEvent(Map<String, Object> event, Date timestamp) {
         try {
             DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
 
-            ObjectMapper m = new ObjectMapper();
-            StringWriter w = new StringWriter();
-            m.writeValue(w, event);
-
-            Entity entity = new Entity("EventQueue");
-            entity.setProperty("createdDateTime", timestamp);
-            entity.setProperty("lastUpdateDateTime", timestamp);
-
-            String payload = w.toString();
-            if (payload.length() > Constants.MAX_LENGTH) {
-                entity.setProperty("payloadText", new Text(payload));
-            } else {
-                entity.setProperty("payload", payload);
-            }
+            Entity entity = EventUtils.createEventLogEntity(event, timestamp);
 
             datastore.put(entity);
             notifyLog();
@@ -158,7 +141,7 @@ private void storeEvent(Map<String, Object> event, Date timestamp) {
 
     @PostPut(kinds = {
             "SurveyGroup", "Survey", "QuestionGroup", "Question", "SurveyInstance",
-            "QuestionAnswerStore", "SurveyedLocale", "DeviceFiles"
+            "QuestionAnswerStore", "SurveyedLocale", "DeviceFiles", "UserRole", "User", "UserAuthorization"
     })
     void logPut(PutContext context) {
 
@@ -211,7 +194,7 @@ void logPut(PutContext context) {
 
     @PostDelete(kinds = {
             "SurveyGroup", "Survey", "QuestionGroup", "Question", "SurveyInstance",
-            "QuestionAnswerStore", "SurveyedLocale", "DeviceFiles"
+            "QuestionAnswerStore", "SurveyedLocale", "DeviceFiles", "UserRole", "User", "UserAuthorization"
     })
     void logDelete(DeleteContext context) {
         try {
diff --git a/GAE/src/org/akvo/flow/events/EventUtils.java b/GAE/src/org/akvo/flow/events/EventUtils.java
index edfa4d2133..49a50d82c0 100644
--- a/GAE/src/org/akvo/flow/events/EventUtils.java
+++ b/GAE/src/org/akvo/flow/events/EventUtils.java
@@ -17,7 +17,6 @@
 package org.akvo.flow.events;
 
 import java.io.IOException;
-import java.io.OutputStreamWriter;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.Date;
@@ -27,7 +26,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.codehaus.jackson.map.ObjectMapper;
+import com.gallatinsystems.common.Constants;
+import org.akvo.flow.util.FlowJsonObjectWriter;
 import org.waterforpeople.mapping.app.web.rest.security.user.GaeUser;
 
 import com.gallatinsystems.survey.domain.SurveyGroup;
@@ -38,14 +38,14 @@
 public class EventUtils {
 
     private static Logger log = Logger.getLogger(EventUtils.class.getName());
-    private static final ObjectMapper objectMapper = new ObjectMapper();
 
     public enum EventSourceType {
         USER, DEVICE, SENSOR, WEBFORM, API, UNKNOWN, SYSTEM
     };
 
     public enum EntityType {
-        SURVEY_GROUP, FORM, QUESTION_GROUP, QUESTION, DATA_POINT, FORM_INSTANCE, ANSWER, DEVICE_FILE
+        SURVEY_GROUP, FORM, QUESTION_GROUP, QUESTION, DATA_POINT, FORM_INSTANCE, ANSWER, DEVICE_FILE,
+        USER, USER_AUTHORIZATION, USER_ROLE
     };
 
     // names of kinds in Google App Engine
@@ -58,6 +58,9 @@ static public class Kind {
         public static final String FORM_INSTANCE = "SurveyInstance";
         public static final String ANSWER = "QuestionAnswerStore";
         public static final String DEVICE_FILE = "DeviceFiles";
+        public static final String USER = "User";
+        public static final String USER_AUTHORIZATION = "UserAuthorization";
+        public static final String USER_ROLE = "UserRole";
     }
 
     // How we name the actions
@@ -71,6 +74,10 @@ static class Action {
         public static final String ANSWER = "answer";
         public static final String DEVICE_FILE = "deviceFile";
 
+        public static final String USER = "user";
+        public static final String USER_AUTHORIZATION = "userAuthorization";
+        public static final String USER_ROLE = "userRole";
+
         public static final String DELETED = "Deleted";
         public static final String CREATED = "Created";
         public static final String UPDATED = "Updated";
@@ -114,7 +121,7 @@ static class Key {
         public static final String ITERATION = "iteration";
     }
 
-    static class Prop {
+    public static class Prop {
         public static final String SURVEY_INSTANCE_ID = "surveyInstanceId";
         public static final String TYPE = "type";
         public static final String VALUE = "value";
@@ -178,6 +185,12 @@ public static EventTypes getEventAndActionType(String kindName) {
                 return new EventTypes(EntityType.QUESTION, Action.QUESTION);
             case Kind.DEVICE_FILE:
                 return new EventTypes(EntityType.DEVICE_FILE, Action.DEVICE_FILE);
+            case Kind.USER:
+                return new EventTypes(EntityType.USER, Action.USER);
+            case Kind.USER_AUTHORIZATION:
+                return new EventTypes(EntityType.USER_AUTHORIZATION, Action.USER_AUTHORIZATION);
+            case Kind.USER_ROLE:
+                return new EventTypes(EntityType.USER_ROLE, Action.USER_ROLE);
         }
         return null;
     }
@@ -269,12 +282,27 @@ public static Map<String, Object> populateEntityProperties(EntityType type, Enti
                 addProperty(Key.QUESTION_TYPE, e.getProperty(Prop.TYPE), data);
                 break;
             case DEVICE_FILE:
-                // FIXME move those keys to the proper place
                 addProperty("uri", e.getProperty("URI"), data);
                 addProperty("checksum", e.getProperty("checksum"), data);
                 addProperty("phoneNumber", e.getProperty("phoneNumber"), data);
                 addProperty("imei", e.getProperty("imei"), data);
                 break;
+            case USER:
+                addProperty("userName", e.getProperty("userName"), data);
+                addProperty("emailAddress", e.getProperty("emailAddress"), data);
+                addProperty("superAdmin", e.getProperty("superAdmin"), data);
+                addProperty("permissionList", e.getProperty("permissionList"), data);
+                addProperty("language", e.getProperty("language"), data);
+                break;
+            case USER_AUTHORIZATION:
+                addProperty("securedObjectId", e.getProperty("securedObjectId"), data);
+                addProperty("userId", e.getProperty("userId"), data);
+                addProperty("roleId", e.getProperty("roleId"), data);
+                break;
+            case USER_ROLE:
+                addProperty("permissions", e.getProperty("permissions"), data);
+                addProperty("name", e.getProperty("name"), data);
+                break;
         }
         return data;
     }
@@ -332,6 +360,21 @@ public static Map<String, Object> newEntity(EntityType type, Long id) {
         return entity;
     }
 
+    public static Entity createEventLogEntity(Map<String, Object> event, Date timestamp) throws IOException {
+        Entity entity = new Entity("EventQueue");
+        entity.setProperty("createdDateTime", timestamp);
+        entity.setProperty("lastUpdateDateTime", timestamp);
+
+        FlowJsonObjectWriter writer = new FlowJsonObjectWriter();
+        String payload = writer.writeAsString(event);
+
+        if (payload.length() > Constants.MAX_LENGTH) {
+            entity.setProperty("payloadText", new Text(payload));
+        } else {
+            entity.setProperty("payload", payload);
+        }
+        return entity;
+    }
     public static void sendEvents(String urlString, List<Map<String, Object>> events)
             throws IOException {
         URL url = new URL(urlString);
@@ -343,14 +386,11 @@ public static void sendEvents(String urlString, List<Map<String, Object>> events
         connection.setRequestProperty("Content-Type",
                 "application/json");
 
-        OutputStreamWriter writer = new OutputStreamWriter(
-                connection.getOutputStream());
-        objectMapper.writeValue(writer, events);
+        FlowJsonObjectWriter writer = new FlowJsonObjectWriter();
+        writer.writeValue(connection.getOutputStream(), events);
 
         System.out.println("    " + connection.getResponseCode());
 
-        writer.close();
         connection.disconnect();
-
     }
 }
diff --git a/GAE/src/org/akvo/flow/servlet/ReportServlet.java b/GAE/src/org/akvo/flow/servlet/ReportServlet.java
index 91703dd7ca..43b8f8c0cb 100644
--- a/GAE/src/org/akvo/flow/servlet/ReportServlet.java
+++ b/GAE/src/org/akvo/flow/servlet/ReportServlet.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2018 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2018-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -31,9 +31,7 @@
 import org.akvo.flow.dao.ReportDao;
 import org.akvo.flow.domain.persistent.Report;
 import org.akvo.flow.rest.dto.ReportTaskRequest;
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
+import org.akvo.flow.util.FlowJsonObjectWriter;
 import org.waterforpeople.mapping.app.web.dto.TaskRequest;
 
 import com.gallatinsystems.common.util.PropertyUtil;
@@ -197,8 +195,7 @@ private void requeueStart(ReportTaskRequest req, Report r, int err) {
         }
     }
 
-    private int startReportEngine(String baseUrl, Report r)
-            throws JsonGenerationException, JsonMappingException, IOException {
+    private int startReportEngine(String baseUrl, Report r) throws IOException {
         //look up user
         final String email = uDao.getByKey(r.getUser()).getEmailAddress();
 
@@ -226,8 +223,9 @@ private int startReportEngine(String baseUrl, Report r)
         criteria.opts.uploadUrl = PropertyUtil.getProperty("surveyuploadurl");
         criteria.opts.flowServices = PropertyUtil.getProperty("flowServices");
         criteria.opts.email = email;
-        ObjectMapper objectMapper = new ObjectMapper();
-        String crit = java.net.URLEncoder.encode(objectMapper.writeValueAsString(criteria), "UTF-8");
+
+        FlowJsonObjectWriter writer = new FlowJsonObjectWriter();
+        String crit = java.net.URLEncoder.encode(writer.writeAsString(criteria), "UTF-8");
 
         URL url = new URL(PropertyUtil.getProperty("flowServices") + "/generate?criteria=" +  crit);
         HttpURLConnection con = (HttpURLConnection) url.openConnection();
diff --git a/GAE/src/org/akvo/flow/util/FlowJsonObjectReader.java b/GAE/src/org/akvo/flow/util/FlowJsonObjectReader.java
new file mode 100644
index 0000000000..c6fa594e1e
--- /dev/null
+++ b/GAE/src/org/akvo/flow/util/FlowJsonObjectReader.java
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (C) 2019 Stichting Akvo (Akvo Foundation)
+ *
+ *  This file is part of Akvo FLOW.
+ *
+ *  Akvo FLOW is free software: you can redistribute it and modify it under the terms of
+ *  the GNU Affero General Public License (AGPL) as published by the Free Software Foundation,
+ *  either version 3 of the License or any later version.
+ *
+ *  Akvo FLOW is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU Affero General Public License included below for more details.
+ *
+ *  The full license text can also be seen at <http://www.gnu.org/licenses/agpl.html>.
+ */
+
+package org.akvo.flow.util;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectReader;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.List;
+
+public class FlowJsonObjectReader extends ObjectMapper {
+
+    public <T> T readObject(String jsonString, TypeReference<T> typeReference) throws IOException {
+        return this.readValue(jsonString, typeReference);
+    }
+
+    public <T> List<T> readDtoListObject(String dtoListJsonString, TypeReference<T> listItemTypeReference) throws IOException {
+
+        JavaType listItemType = this.getTypeFactory().constructType(listItemTypeReference);
+        JavaType type = this.getTypeFactory().constructParametrizedType(List.class,List.class, listItemType);
+        ObjectReader reader = this.readerFor(type);
+
+        JsonNode dtoListNode = this.readTree(dtoListJsonString).get("dtoList");
+        return reader.readValue(dtoListNode);
+    }
+
+    public <T> T readObject(URL url, TypeReference<T> typeReference) throws IOException {
+        return this.readValue(url, typeReference);
+    }
+}
diff --git a/GAE/src/org/akvo/flow/util/FlowJsonObjectWriter.java b/GAE/src/org/akvo/flow/util/FlowJsonObjectWriter.java
new file mode 100644
index 0000000000..4d9c7f64b6
--- /dev/null
+++ b/GAE/src/org/akvo/flow/util/FlowJsonObjectWriter.java
@@ -0,0 +1,44 @@
+/*
+ *  Copyright (C) 2018-2019 Stichting Akvo (Akvo Foundation)
+ *
+ *  This file is part of Akvo FLOW.
+ *
+ *  Akvo FLOW is free software: you can redistribute it and modify it under the terms of
+ *  the GNU Affero General Public License (AGPL) as published by the Free Software Foundation,
+ *  either version 3 of the License or any later version.
+ *
+ *  Akvo FLOW is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU Affero General Public License included below for more details.
+ *
+ *  The full license text can also be seen at <http://www.gnu.org/licenses/agpl.html>.
+ */
+
+package org.akvo.flow.util;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class FlowJsonObjectWriter extends ObjectMapper {
+
+    public FlowJsonObjectWriter withExcludeNullValues() {
+        this.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        return this;
+    }
+
+    public void writeValue(OutputStream outStream, Object value) throws IOException {
+        super.writeValue(outStream, value);
+    }
+
+    public String writeAsString(Object value) throws IOException {
+        try {
+            return super.writeValueAsString(value);
+        } catch (JsonProcessingException e) {
+            throw new IOException(e);
+        }
+    }
+}
diff --git a/GAE/src/org/waterforpeople/mapping/analytics/dao/SurveyQuestionSummaryDao.java b/GAE/src/org/waterforpeople/mapping/analytics/dao/SurveyQuestionSummaryDao.java
index 0609e69c95..636f587943 100644
--- a/GAE/src/org/waterforpeople/mapping/analytics/dao/SurveyQuestionSummaryDao.java
+++ b/GAE/src/org/waterforpeople/mapping/analytics/dao/SurveyQuestionSummaryDao.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2012, 2017 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2012, 2017-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -21,6 +21,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -31,9 +32,11 @@
 import net.sf.jsr107cache.Cache;
 import net.sf.jsr107cache.CacheException;
 
+import org.akvo.flow.domain.DataUtils;
 import org.waterforpeople.mapping.analytics.domain.SurveyQuestionSummary;
 import org.waterforpeople.mapping.domain.QuestionAnswerStore;
 
+import com.gallatinsystems.common.Constants;
 import com.gallatinsystems.common.util.MemCacheUtils;
 import com.gallatinsystems.framework.dao.BaseDAO;
 import com.gallatinsystems.framework.domain.BaseDomain;
@@ -58,37 +61,31 @@ public SurveyQuestionSummaryDao() {
      * inefficient but is the only way we can be sure we're keeping the count consistent since there
      * is no "select for update" or sql dml-like construct
      *
-     * @param answer
+     * @param questionAnswer
      */
     @SuppressWarnings("rawtypes")
-    public static synchronized void incrementCount(QuestionAnswerStore answer,
-            int unit) {
+    public static synchronized void incrementCount(QuestionAnswerStore questionAnswer, int unit) {
         PersistenceManager pm = PersistenceFilter.getManager();
-        String answerText = answer.getValue();
-        String[] answers;
-        if (answerText != null && answerText.contains("|")) {
-            answers = answerText.split("\\|");
-        } else {
-            answers = new String[] {
-                    answerText
-            };
-        }
+        String[] answers = DataUtils.optionResponsesTextArray(questionAnswer.getValue()); //JSON or |
+
         for (int i = 0; i < answers.length; i++) {
+            String answer = answers[i];
+            if (answer.length() > Constants.MAX_LENGTH) {
+                answer = answer.substring(0, Constants.MAX_LENGTH);
+            }
             // find surveyQuestionSummary objects with the right question id and answer text
             javax.jdo.Query query = pm.newQuery(SurveyQuestionSummary.class);
-            query
-                    .setFilter("questionId == questionIdParam && response == answerParam");
-            query
-                    .declareParameters("String questionIdParam, String answerParam");
-            List results = (List) query.execute(answer.getQuestionID(),
-                    answers[i]);
+            query.setFilter("questionId == questionIdParam && response == answerParam");
+            query.declareParameters("String questionIdParam, String answerParam");
+            List results = (List) query.execute(questionAnswer.getQuestionID(), answer);
+
             SurveyQuestionSummary summary = null;
             if ((results == null || results.size() == 0) && unit > 0) {
                 // no previous surveyQuestionSummary for this answer, make a new one
                 summary = new SurveyQuestionSummary();
                 summary.setCount(new Long(unit));
-                summary.setQuestionId(answer.getQuestionID());
-                summary.setResponse(answers[i]);
+                summary.setQuestionId(questionAnswer.getQuestionID());
+                summary.setResponse(answer);
             } else if (results != null && results.size() > 0) {
                 // update an existing questionAnswerSummary
                 summary = (SurveyQuestionSummary) results.get(0);
@@ -124,10 +121,19 @@ public List<SurveyQuestionSummary> listByQuestion(String qId) {
      */
     @SuppressWarnings("unchecked")
     public List<SurveyQuestionSummary> listByResponse(String questionId, String questionResponse) {
+        if (questionResponse == null) {
+            return Collections.emptyList();
+        }
+        //Truncate too-long key
+        String answer = questionResponse;
+        if (answer.length() > Constants.MAX_LENGTH) {
+            answer = answer.substring(0, Constants.MAX_LENGTH);
+        }
+
         List<SurveyQuestionSummary> result = null;
         String cacheKey = null;
         try {
-            cacheKey = getCacheKey(questionId + "-" + questionResponse);
+            cacheKey = getCacheKey(questionId + "-" + answer);
             if (MemCacheUtils.containsKey(cache, cacheKey)) { //let's try to get it
                 SurveyQuestionSummary sqs = (SurveyQuestionSummary)cache.get(cacheKey);
                 if (sqs != null) {
@@ -149,8 +155,7 @@ public List<SurveyQuestionSummary> listByResponse(String questionId, String ques
         paramMap = new HashMap<String, Object>();
 
         appendNonNullParam("questionId", filterString, paramString, "String", questionId, paramMap);
-        appendNonNullParam("response", filterString, paramString, "String", questionResponse,
-                paramMap);
+        appendNonNullParam("response", filterString, paramString, "String", answer, paramMap);
 
         query.setFilter(filterString.toString());
         query.declareParameters(paramString.toString());
@@ -233,8 +238,8 @@ public SurveyQuestionSummary save(SurveyQuestionSummary summary) {
      * @param summary
      */
     public List<SurveyQuestionSummary> save(List<SurveyQuestionSummary> summary) {
-        List<SurveyQuestionSummary> savedSummaryList = (List<SurveyQuestionSummary>) super
-                .save(summary);
+        List<SurveyQuestionSummary> savedSummaryList =
+                (List<SurveyQuestionSummary>) super.save(summary);
         cache(savedSummaryList);
         return savedSummaryList;
     }
diff --git a/GAE/src/org/waterforpeople/mapping/app/gwt/client/survey/SurveyGroupDto.java b/GAE/src/org/waterforpeople/mapping/app/gwt/client/survey/SurveyGroupDto.java
index b69d63ebba..390a3c62d4 100644
--- a/GAE/src/org/waterforpeople/mapping/app/gwt/client/survey/SurveyGroupDto.java
+++ b/GAE/src/org/waterforpeople/mapping/app/gwt/client/survey/SurveyGroupDto.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2016 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2016,2018 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -20,7 +20,7 @@
 import java.util.Date;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import com.gallatinsystems.framework.gwt.dto.client.BaseDto;
 import com.gallatinsystems.survey.domain.SurveyGroup;
diff --git a/GAE/src/org/waterforpeople/mapping/app/gwt/server/survey/SurveyServiceImpl.java b/GAE/src/org/waterforpeople/mapping/app/gwt/server/survey/SurveyServiceImpl.java
index db5bc37c40..d006cb9240 100644
--- a/GAE/src/org/waterforpeople/mapping/app/gwt/server/survey/SurveyServiceImpl.java
+++ b/GAE/src/org/waterforpeople/mapping/app/gwt/server/survey/SurveyServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2018 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -30,22 +30,14 @@
 import org.waterforpeople.mapping.app.gwt.client.survey.QuestionOptionDto;
 import org.waterforpeople.mapping.app.gwt.client.survey.TranslationDto;
 import org.waterforpeople.mapping.app.util.DtoMarshaller;
-import org.waterforpeople.mapping.app.web.DataProcessorRestServlet;
-import org.waterforpeople.mapping.app.web.dto.SurveyAssemblyRequest;
-
 import com.gallatinsystems.survey.dao.CascadeResourceDao;
-import com.gallatinsystems.survey.dao.SurveyDAO;
-import com.gallatinsystems.survey.dao.SurveyGroupDAO;
 import com.gallatinsystems.survey.domain.CascadeResource;
 import com.gallatinsystems.survey.domain.Question;
 import com.gallatinsystems.survey.domain.QuestionHelpMedia;
 import com.gallatinsystems.survey.domain.QuestionOption;
-import com.gallatinsystems.survey.domain.Survey;
-import com.gallatinsystems.survey.domain.SurveyGroup;
 import com.gallatinsystems.survey.domain.Translation;
 import com.gallatinsystems.survey.domain.Translation.ParentType;
 import com.google.appengine.api.datastore.KeyFactory;
-import com.google.appengine.api.taskqueue.TaskOptions;
 
 @Deprecated
 public class SurveyServiceImpl {
@@ -259,21 +251,4 @@ public Question marshalQuestion(QuestionDto qdto) {
         return q;
     }
 
-    public void publishSurveyAsync(Long surveyId) {
-        TaskOptions options = TaskOptions.Builder
-                .withUrl("/app_worker/surveyassembly")
-                .param("action", SurveyAssemblyRequest.ASSEMBLE_SURVEY)
-                .param("surveyId", surveyId.toString());
-        com.google.appengine.api.taskqueue.Queue queue = com.google.appengine.api.taskqueue.QueueFactory
-                .getQueue("surveyAssembly");
-        queue.add(options);
-
-        Survey s = new SurveyDAO().getById(surveyId);
-        SurveyGroup sg = s != null ? new SurveyGroupDAO().getByKey(s.getSurveyGroupId()) : null;
-        if (sg != null && sg.getNewLocaleSurveyId() != null &&
-                sg.getNewLocaleSurveyId().longValue() == surveyId.longValue()) {
-            // This is the registration form. Schedule datapoint name re-assembly
-            DataProcessorRestServlet.scheduleDatapointNameAssembly(sg.getKey().getId(), null);
-        }
-    }
 }
diff --git a/GAE/src/org/waterforpeople/mapping/app/gwt/server/surveyinstance/SurveyInstanceServiceImpl.java b/GAE/src/org/waterforpeople/mapping/app/gwt/server/surveyinstance/SurveyInstanceServiceImpl.java
deleted file mode 100644
index 8a479bcde8..0000000000
--- a/GAE/src/org/waterforpeople/mapping/app/gwt/server/surveyinstance/SurveyInstanceServiceImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  Copyright (C) 2010-2018 Stichting Akvo (Akvo Foundation)
- *
- *  This file is part of Akvo FLOW.
- *
- *  Akvo FLOW is free software: you can redistribute it and modify it under the terms of
- *  the GNU Affero General Public License (AGPL) as published by the Free Software Foundation,
- *  either version 3 of the License or any later version.
- *
- *  Akvo FLOW is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *  See the GNU Affero General Public License included below for more details.
- *
- *  The full license text can also be seen at <http://www.gnu.org/licenses/agpl.html>.
- */
-
-package org.waterforpeople.mapping.app.gwt.server.surveyinstance;
-
-import org.waterforpeople.mapping.domain.SurveyInstance;
-import com.gallatinsystems.surveyal.app.web.SurveyalRestRequest;
-import com.google.appengine.api.taskqueue.QueueFactory;
-import com.google.appengine.api.taskqueue.TaskOptions;
-
-@Deprecated
-public class SurveyInstanceServiceImpl {
-
-
-
-    public void sendProcessingMessages(SurveyInstance domain) {
-        // send asyn crequest to summarize the instance
-        QueueFactory.getQueue("dataSummarization").add(
-                TaskOptions.Builder.withUrl("/app_worker/datasummarization")
-                        .param("objectKey", domain.getKey().getId() + "")
-                        .param("type", "SurveyInstance"));
-        QueueFactory.getDefaultQueue().add(
-                TaskOptions.Builder
-                        .withUrl("/app_worker/surveyalservlet")
-                        .param(SurveyalRestRequest.ACTION_PARAM,
-                                SurveyalRestRequest.INGEST_INSTANCE_ACTION)
-                        .param(SurveyalRestRequest.SURVEY_INSTANCE_PARAM,
-                                domain.getKey().getId() + ""));
-    }
-
-}
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/BootstrapGeneratorServlet.java b/GAE/src/org/waterforpeople/mapping/app/web/BootstrapGeneratorServlet.java
index cd4f08c072..0f922dbfe2 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/BootstrapGeneratorServlet.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/BootstrapGeneratorServlet.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2018 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -43,6 +43,8 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
 
 import static com.gallatinsystems.common.Constants.DEFAULT_SURVEY_FILE_NAME;
 
@@ -114,18 +116,13 @@ private void generateFile(BootstrapGeneratorRequest req) {
                 try {
                     Survey s = surveyDao.getById(id);
                     String surveyFilename = generateSanitizedFilename(s.getName());
-                    StringBuilder buf = new StringBuilder();
+                    long formId = s.getKey().getId();
                     URLConnection conn = S3Util.getConnection(bucketName, keyPrefix + "/"
-                            + s.getKey().getId() + ".xml");
-                    BufferedReader reader = new BufferedReader(
-                            new InputStreamReader(conn.getInputStream(), "UTF-8"));
-                    String line;
-                    while ((line = reader.readLine()) != null) {
-                        buf.append(line).append("\n");
-                    }
-                    reader.close();
-                    contentMap.put(s.getKey().getId() + "/" + surveyFilename + ".xml",
-                            buf.toString());
+                            + formId + ".zip");
+                    String formName = formId + ".xml";
+                    String xmlContents = ZipUtil.unZipFile(formName,
+                            new ZipInputStream(new BufferedInputStream(conn.getInputStream())));
+                    contentMap.put(formId + "/" + surveyFilename + ".xml", xmlContents);
 
                     resourcesSet.addAll(getSurveyResources(id));// Add survey resources
                 } catch (Exception e) {
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/CronCommanderServlet.java b/GAE/src/org/waterforpeople/mapping/app/web/CronCommanderServlet.java
index 82f58b7d5c..4d4df225a4 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/CronCommanderServlet.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/CronCommanderServlet.java
@@ -92,22 +92,22 @@ private void purgeExpiredDevices() {
         log.info("Found " + deviceList.size() + " old Devices");
 
         for (Device d: deviceList) { //Clean up everything referencing this device
-        	
-        	long did = d.getKey().getId();
-        	List<DeviceSurveyJobQueue> djql = dsjqDao.get(d.getPhoneNumber(), d.getEsn(), d.getAndroidId());
-        	if (djql.size() > 0) {
-        		log.fine("Deleting " + djql.size() + " form assignments for device " + did);
-        		dsjqDao.delete(djql);
-        	}
-        	List<DeviceFileJobQueue> dfql = dfjqDao.listByDeviceId(did);
-        	if (dfql.size() > 0) {
-        		log.fine("Deleting " + dfql.size() + " file requests for device " + did);
-        		dfjqDao.delete(dfql);
-        	}
-
-        	int affected = saDao.removeDevice(did);
-        	log.fine("Removed device " + did + " from " + affected + " assignments.");
-        	
+
+            long did = d.getKey().getId();
+            List<DeviceSurveyJobQueue> djql = dsjqDao.get(d.getPhoneNumber(), d.getEsn(), d.getAndroidId());
+            if (djql.size() > 0) {
+                log.fine("Deleting " + djql.size() + " form assignments for device " + did);
+                dsjqDao.delete(djql);
+            }
+            List<DeviceFileJobQueue> dfql = dfjqDao.listByDeviceId(did);
+            if (dfql.size() > 0) {
+                log.fine("Deleting " + dfql.size() + " file requests for device " + did);
+                dfjqDao.delete(dfql);
+            }
+
+            int affected = saDao.removeDevice(did);
+            log.fine("Removed device " + did + " from " + affected + " assignments.");
+
         }
         deviceDao.delete(deviceList);
     }
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/CurrentUserServlet.java b/GAE/src/org/waterforpeople/mapping/app/web/CurrentUserServlet.java
index 2ee08a7e69..635e227fe5 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/CurrentUserServlet.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/CurrentUserServlet.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2012-2016, 2018 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2012-2016, 2018-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -33,12 +33,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.akvo.flow.util.FlowJsonObjectWriter;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
 
 import com.gallatinsystems.common.Constants;
 import com.gallatinsystems.user.dao.UserAuthorizationDAO;
@@ -148,19 +146,15 @@ private String getPermissionsMap(User currentUser) {
 
         addSuperAdminPermissions(currentUser, permissions);
 
-        ObjectMapper jsonObjectMapper = new ObjectMapper();
-        StringWriter writer = new StringWriter();
+        FlowJsonObjectWriter writer = new FlowJsonObjectWriter();
+        String permissionsString = null;
         try {
-            jsonObjectMapper.writeValue(writer, permissions);
-        } catch (JsonGenerationException e) {
-            // ignore
-        } catch (JsonMappingException e) {
-            // ignore
+            permissionsString = writer.writeAsString(permissions);
         } catch (IOException e) {
             // ignore
         }
 
-        return writer.toString();
+        return permissionsString;
     }
 
     /**
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/DataProcessorRestServlet.java b/GAE/src/org/waterforpeople/mapping/app/web/DataProcessorRestServlet.java
index eddab083da..7024023ddf 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/DataProcessorRestServlet.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/DataProcessorRestServlet.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2018 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -46,7 +46,6 @@
 import org.waterforpeople.mapping.dao.QuestionAnswerStoreDao;
 import org.waterforpeople.mapping.dao.SurveyInstanceDAO;
 import org.waterforpeople.mapping.dataexport.SurveyReplicationImporter;
-import org.waterforpeople.mapping.domain.GeoCoordinates;
 import org.waterforpeople.mapping.domain.QuestionAnswerStore;
 import org.waterforpeople.mapping.domain.SurveyInstance;
 
@@ -55,9 +54,6 @@
 import com.gallatinsystems.framework.rest.RestRequest;
 import com.gallatinsystems.framework.rest.RestResponse;
 import com.gallatinsystems.framework.servlet.PersistenceFilter;
-import com.gallatinsystems.gis.location.GeoLocationService;
-import com.gallatinsystems.gis.location.GeoLocationServiceGeonamesImpl;
-import com.gallatinsystems.gis.location.GeoPlace;
 import com.gallatinsystems.messaging.dao.MessageDao;
 import com.gallatinsystems.messaging.domain.Message;
 import com.gallatinsystems.operations.dao.ProcessingStatusDao;
@@ -81,7 +77,6 @@
 import com.gallatinsystems.surveyal.dao.SurveyedLocaleDao;
 import com.gallatinsystems.surveyal.domain.SurveyalValue;
 import com.gallatinsystems.surveyal.domain.SurveyedLocale;
-import com.google.appengine.api.backends.BackendServiceFactory;
 import com.google.appengine.api.memcache.MemcacheService;
 import com.google.appengine.api.memcache.stdimpl.GCacheFactory;
 import com.google.appengine.api.taskqueue.Queue;
@@ -94,8 +89,7 @@
  * @author Christopher Fagiani
  */
 public class DataProcessorRestServlet extends AbstractRestApiServlet {
-    private static final Logger log = Logger
-            .getLogger("DataProcessorRestServlet");
+    private static final Logger log = Logger.getLogger("DataProcessorRestServlet");
     private static final long serialVersionUID = -7902002525342262821L;
     private static final String REBUILD_Q_SUM_STATUS_KEY = "rebuildQuestionSummary";
     private static final Integer QAS_PAGE_SIZE = 300;
@@ -103,6 +97,7 @@ public class DataProcessorRestServlet extends AbstractRestApiServlet {
     private static final Integer T_PAGE_SIZE = 300;
     private static final Integer SVAL_PAGE_SIZE = 600;
     private static final String QAS_TO_REMOVE = "QAStoRemove";
+    private static final String FORM_COPY_STATUS_KEY = "copyForm";
     private static final long NAME_ASSEMBLY_TASK_DELAY = 3 * 1000;// 3 seconds
 
     private SurveyInstanceDAO siDao;
@@ -121,16 +116,37 @@ protected RestResponse handleRequest(RestRequest req) throws Exception {
         if (DataProcessorRequest.REBUILD_QUESTION_SUMMARY_ACTION
                 .equalsIgnoreCase(dpReq.getAction())) {
             rebuildQuestionSummary(dpReq.getSurveyId());
-        } else if (DataProcessorRequest.COPY_SURVEY.equalsIgnoreCase(dpReq
-                .getAction())) {
+        } else if (DataProcessorRequest.COPY_SURVEY.equalsIgnoreCase(dpReq.getAction())) {
+            String source = dpReq.getSource();
+            //Instrumentation
+            Date start = new Date();
+            ProcessingStatusDao statusDao = new ProcessingStatusDao();
+            ProcessingStatus status = statusDao.getOrCreateStatusByCode(
+                    FORM_COPY_STATUS_KEY + (source != null ? ":" + source : ""));
+            status.setLastEventDate(start);
+            status.setInError(true); //In case it never saves an end sts
+            status.setValue("inProgress, target=" + dpReq.getSurveyId());
+            statusDao.save(status);
+
             copySurvey(dpReq.getSurveyId(), Long.valueOf(dpReq.getSource()));
+
+            // now update the status
+            status.setInError(false);
+            status.setValue("finished, target=" + dpReq.getSurveyId());
+            Long duration = new Date().getTime() - start.getTime();
+            if (duration > status.getMaxDurationMs()) {
+                status.setMaxDurationMs(duration);
+                status.setMaxDurationDate(start);
+            }
+            statusDao.save(status);
+
         } else if (DataProcessorRequest.COPY_QUESTION_GROUP.equalsIgnoreCase(dpReq
                 .getAction())) {
             QuestionGroupDao qgDao = new QuestionGroupDao();
             QuestionGroup newQuestionGroup = qgDao.getByKey(dpReq.getQuestionGroupId());
             QuestionGroup originalQuestionGroup = qgDao.getByKey(Long.valueOf(dpReq.getSource()));
             if (originalQuestionGroup != null && newQuestionGroup != null) {
-                
+
                 Long surveyId = originalQuestionGroup.getSurveyId();
                 SurveyUtils.copyQuestionGroup(originalQuestionGroup, newQuestionGroup,
                         surveyId, null, SurveyUtils.listQuestionIdsUsedInSurveyGroup(surveyId));
@@ -225,13 +241,16 @@ protected RestResponse handleRequest(RestRequest req) throws Exception {
             if (dpReq.getSurveyInstanceId() != null) {
                 deleteSurveyResponses(dpReq.getSurveyInstanceId());
             }
-        } else if (DataProcessorRequest.SURVEY_RESPONSE_COUNT.equalsIgnoreCase(req
-                .getAction())) {
+        } else if (DataProcessorRequest.SURVEY_RESPONSE_COUNT.equalsIgnoreCase(req.getAction())) {
             if (dpReq.getSummaryCounterId() != null && dpReq.getDelta() != null) {
                 updateSurveyResponseCounter(dpReq.getSummaryCounterId(), dpReq.getDelta());
             }
-        } else if (DataProcessorRequest.DELETE_CASCADE_NODES.equalsIgnoreCase(req.getAction())) {
-            deleteCascadeNodes(dpReq.getCascadeResourceId(), dpReq.getParentNodeId());
+        } else if (DataProcessorRequest.UPDATE_SURVEY_INSTANCE_SUMMARIES.equalsIgnoreCase(req.getAction())) {
+            if (dpReq.getSurveyInstanceId() != null && dpReq.getDelta() != null) {
+                updateSurveyInstanceResponseCounters(dpReq.getSurveyInstanceId(), dpReq.getDelta());
+            }
+        } else if (DataProcessorRequest.DELETE_CHILD_CASCADE_NODES.equalsIgnoreCase(req.getAction())) {
+            deleteChildCascadeNodes(dpReq.getCascadeResourceId(), dpReq.getParentNodeId());
         } else if (DataProcessorRequest.ASSEMBLE_DATAPOINT_NAME.equalsIgnoreCase(req.getAction())) {
             assembleDatapointName(dpReq.getSurveyGroupId(), dpReq.getSurveyedLocaleId());
         }
@@ -444,10 +463,7 @@ private void deleteDuplicatedQAS(Long offset) {
                     .param(DataProcessorRequest.ACTION_PARAM,
                             DataProcessorRequest.DELETE_DUPLICATE_QAS)
                     .param(DataProcessorRequest.OFFSET_PARAM,
-                            String.valueOf(offset + QAS_PAGE_SIZE))
-                    .header("Host",
-                            BackendServiceFactory.getBackendService()
-                                    .getBackendAddress("dataprocessor"));
+                            String.valueOf(offset + QAS_PAGE_SIZE));
             Queue queue = QueueFactory.getDefaultQueue();
             queue.add(options);
 
@@ -967,7 +983,7 @@ public static void populateMonitoringFieldsLocale(String cursor,
         final SurveyInstanceDAO siDao = new SurveyInstanceDAO();
         final QuestionDao qDao = new QuestionDao();
         final QuestionAnswerStoreDao qasDao = new QuestionAnswerStoreDao();
-        
+
         List<SurveyedLocale> locales = null;
         if (surveyedLocaleId != null) {
             // Single locale update
@@ -1088,9 +1104,6 @@ public static void populateMonitoringFieldsLocale(String cursor,
             final String cursorParam = SurveyedLocaleDao.getCursor(locales);
             final TaskOptions options = TaskOptions.Builder
                     .withUrl("/app_worker/dataprocessor")
-                    .header("Host",
-                            BackendServiceFactory.getBackendService().getBackendAddress(
-                                    "dataprocessor"))
                     .param(DataProcessorRequest.ACTION_PARAM,
                             DataProcessorRequest.POPULATE_MONITORING_FIELDS_LOCALE_ACTION)
                     .param(DataProcessorRequest.SURVEY_ID_PARAM, surveyId.toString())
@@ -1147,9 +1160,6 @@ private void createNewIdentifiersLocales(String cursor, Long surveyId) {
             final String cursorParam = SurveyedLocaleDao.getCursor(results);
             final TaskOptions options = TaskOptions.Builder
                     .withUrl("/app_worker/dataprocessor")
-                    .header("Host",
-                            BackendServiceFactory.getBackendService().getBackendAddress(
-                                    "dataprocessor"))
                     .param(DataProcessorRequest.ACTION_PARAM,
                             DataProcessorRequest.CREATE_NEW_IDENTIFIERS_LOCALES_ACTION)
                     .param(DataProcessorRequest.SURVEY_ID_PARAM, surveyId.toString())
@@ -1248,10 +1258,7 @@ private void populateQuestionOrdersSurveyalValues(Long surveyId, String cursor)
                     .withUrl("/app_worker/dataprocessor")
                     .param(DataProcessorRequest.ACTION_PARAM,
                             DataProcessorRequest.POP_QUESTION_ORDER_FIELDS_ACTION)
-                    .param("cursor", newCursor)
-                    .header("host",
-                            BackendServiceFactory.getBackendService().getBackendAddress(
-                                    "dataprocessor"));
+                    .param("cursor", newCursor);
 
             if (surveyId != null) {
                 to.param(DataProcessorRequest.SURVEY_ID_PARAM, surveyId.toString());
@@ -1274,7 +1281,7 @@ private void deleteSurveyResponses(Long surveyInstanceId) {
     }
 
     /**
-     * Update a survey response counter according to the provided delta. This method should be
+     * Update a single survey response counter according to the provided delta. This method should be
      * invoked though the task queue 'surveyResponseCount' to avoid concurrent updates
      *
      * @param summaryCounterId
@@ -1291,46 +1298,54 @@ private void updateSurveyResponseCounter(long summaryCounterId, int delta) {
         summaryDao.save(summary);
     }
 
-    private void deleteCascadeNodes(Long cascadeResourceId, Long parentNodeId) {
+    /**
+     * Update all survey response counters for the provided surveyInstance. This method should be
+     * invoked though the task queue 'surveyResponseCount' to avoid concurrent updates
+     *
+     * @param surveyInstanceId
+     * @param delta +1 or -1
+     */
+
+    private void updateSurveyInstanceResponseCounters(long surveyInstanceId, int delta) {
+        SurveyInstanceDAO siDao = new SurveyInstanceDAO();
+        if (delta == 1 || delta == -1) {
+            siDao.updateSummaryCounts(surveyInstanceId, delta > 0);
+        }
+    }
+
+    private void deleteChildCascadeNodes(Long cascadeResourceId, Long parentNodeId) {
         final CascadeNodeDao dao = new CascadeNodeDao();
-        List<CascadeNode> nodes = dao.listCascadeNodesByResourceAndParentId(cascadeResourceId,
+        List<CascadeNode> childNodes = dao.listCascadeNodesByResourceAndParentId(cascadeResourceId,
                 parentNodeId == null ? 0l : parentNodeId);
 
-        if (nodes.isEmpty()) {
-            return;
+        if (childNodes.isEmpty()) {
+            return; // child node is leaf node. no need for further action
         }
 
-        if (!areLeafNodes(dao, cascadeResourceId, nodes)) {
-            for (CascadeNode node : nodes) {
-                scheduleCascadeNodeDeletion(cascadeResourceId, node.getKey().getId());
-            }
+        for (CascadeNode node : childNodes) {
+            scheduleChildCascadeNodeDeletion(cascadeResourceId, node.getKey().getId());
         }
-
-        dao.delete(nodes);
+        dao.delete(childNodes);
     }
 
-    private boolean areLeafNodes(CascadeNodeDao dao, Long cascadeResourceId,
-            List<CascadeNode> nodes) {
-        CascadeNode firstNode = nodes.get(0);
-        List<CascadeNode> childNodes = dao.listCascadeNodesByResourceAndParentId(
-                cascadeResourceId, firstNode.getKey().getId());
-        return childNodes.size() == 0;
+    public static void scheduleCascadeResourceDeletion(Long cascadeResourceId) {
+        scheduleChildCascadeNodeDeletion(cascadeResourceId, null);
     }
 
-    private void scheduleCascadeNodeDeletion(Long cascadeResourceId, Long parentNodeId) {
+    public static void scheduleChildCascadeNodeDeletion(Long cascadeResourceId, Long parentNodeId) {
         try {
             final TaskOptions options = TaskOptions.Builder
                     .withUrl("/app_worker/dataprocessor")
-                    .header("Host",
-                            BackendServiceFactory.getBackendService()
-                                    .getBackendAddress("dataprocessor"))
                     .param(DataProcessorRequest.ACTION_PARAM,
-                            DataProcessorRequest.DELETE_CASCADE_NODES)
+                            DataProcessorRequest.DELETE_CHILD_CASCADE_NODES)
                     .param(DataProcessorRequest.CASCADE_RESOURCE_ID,
-                            cascadeResourceId.toString())
-                    .param(DataProcessorRequest.PARENT_NODE_ID, parentNodeId.toString());
-            final Queue queue = QueueFactory.getQueue("background-processing");
-            queue.add(options);
+                            cascadeResourceId.toString());
+
+            if (parentNodeId != null) {
+                options.param(DataProcessorRequest.PARENT_NODE_ID, parentNodeId.toString());
+            }
+
+            QueueFactory.getQueue("background-processing").add(options);
         } catch (Exception e) {
             log.log(Level.SEVERE,
                     String.format(
@@ -1338,73 +1353,75 @@ private void scheduleCascadeNodeDeletion(Long cascadeResourceId, Long parentNode
                             cascadeResourceId, parentNodeId), e);
         }
     }
-    
+
     private void assembleDatapointName(Long surveyGroupId, Long surveyedLocaleId) {
         if (surveyedLocaleId == null && surveyGroupId == null) {
             log.log(Level.WARNING, "Either surveyGroupId or surveyedLocaleId must be defined");
             return;
         }
-        
-        final SurveyGroupDAO sgDao = new SurveyGroupDAO();
+
+        if (surveyedLocaleId != null) {
+            assembleSingleDataPointName(surveyedLocaleId);
+        } else {
+            assembleAllDataPointNames(surveyGroupId);
+        }
+    }
+
+    private void assembleSingleDataPointName(Long dataPointId) {
         final SurveyedLocaleDao slDao = new SurveyedLocaleDao();
+        final SurveyGroupDAO sgDao = new SurveyGroupDAO();
         final SurveyInstanceDAO siDao = new SurveyInstanceDAO();
         final QuestionDao qDao = new QuestionDao();
         final QuestionAnswerStoreDao qasDao = new QuestionAnswerStoreDao();
-        
-        List<SurveyedLocale> locales = null;
-        if (surveyedLocaleId != null) {
-            // Single locale update
-            SurveyedLocale sl = slDao.getById(surveyedLocaleId);
-            if (sl == null) {
-                log.log(Level.WARNING, "SurveyedLocale not found: " + surveyedLocaleId);
-                return;
-            }
-            surveyGroupId = sl.getSurveyGroupId();
-            locales = new ArrayList<>();
-            locales.add(slDao.getById(surveyedLocaleId));
-        } else {
-            // Fetch all locales for this survey group
-            locales = slDao.listLocalesBySurveyGroupId(surveyGroupId);
+
+        final SurveyedLocale sl = slDao.getById(dataPointId);
+        if (sl == null) {
+            log.severe("SurveyedLocale not found: " + dataPointId);
+            return;
         }
-        
+
+        final Long surveyGroupId = sl.getSurveyGroupId();
         SurveyGroup sg = sgDao.getByKey(surveyGroupId);
         if (sg == null || sg.getNewLocaleSurveyId() == null) {
-            log.log(Level.WARNING, "SurveyGroup or registration form not found: " + surveyGroupId);
+            log.severe("SurveyGroup or registration form not found: " + surveyGroupId);
             return;
         }
 
         List<Question> nameQuestions = qDao.listDisplayNameQuestionsBySurveyId(sg.getNewLocaleSurveyId());
-        
+
+        SurveyInstance si = siDao.getRegistrationSurveyInstance(sl, sg.getNewLocaleSurveyId());
+        if (si == null) {
+            log.severe("Null registration SurveyInstance for locale: " + sl.getKey().getId());
+            return;
+        }
+
+        List<QuestionAnswerStore> responses = qasDao.listBySurveyInstance(si.getKey().getId());
+        sl.assembleDisplayName(nameQuestions, responses);
+        slDao.save(sl);
+
+        log.fine("Reassembled display name for SurveyedLocale : " +
+            sl.getKey().getId() + ": " + sl.getDisplayName());
+    }
+
+    private void assembleAllDataPointNames(Long surveyGroupId) {
+        final SurveyedLocaleDao slDao = new SurveyedLocaleDao();
+        List<SurveyedLocale> locales = slDao.listLocalesBySurveyGroupId(surveyGroupId);
+
         for (SurveyedLocale sl : locales) {
-            try {
-                SurveyInstance si = siDao.getRegistrationSurveyInstance(sl, sg.getNewLocaleSurveyId());
-                if (si == null) {
-                    log.log(Level.WARNING, "Null registartion SurveyInstance for locale: " + sl.getKey().getId());
-                    continue;
-                }
-                
-                List<QuestionAnswerStore> responses = qasDao.listBySurveyInstance(si.getKey().getId());
-                sl.assembleDisplayName(nameQuestions, responses);
-                log.info("Reassembled display name for SurveyedLocale : " + 
-                            sl.getKey().getId() + ": " + sl.getDisplayName());
-                slDao.save(sl);
-            } catch (Exception e) {
-                log.log(Level.SEVERE, "Problem while assembling datapoint name: " + e.getMessage(), e);
-            }
+            scheduleDatapointNameAssembly(surveyGroupId, sl.getKey().getId());
         }
     }
-    
+
     public static void scheduleDatapointNameAssembly(Long surveyGroupId, Long surveyedLocaleId) {
         scheduleDatapointNameAssembly(surveyGroupId, surveyedLocaleId, false);
     }
-    
+
     public static void scheduleDatapointNameAssembly(Long surveyGroupId, Long surveyedLocaleId, boolean delay) {
-        log.info("Scheduling name assembly for survey group, locale - " + surveyGroupId +", " + surveyedLocaleId);
+        log.fine("Scheduling name assembly for survey group, locale - " + surveyGroupId +", " + surveyedLocaleId);
         final TaskOptions options = TaskOptions.Builder
                 .withUrl("/app_worker/dataprocessor")
-                .header("Host", BackendServiceFactory.getBackendService().getBackendAddress("dataprocessor"))
                 .param(DataProcessorRequest.ACTION_PARAM, DataProcessorRequest.ASSEMBLE_DATAPOINT_NAME);
-        
+
         if (delay) {
             options.countdownMillis(NAME_ASSEMBLY_TASK_DELAY);
         }
@@ -1414,9 +1431,27 @@ public static void scheduleDatapointNameAssembly(Long surveyGroupId, Long survey
         if (surveyedLocaleId != null) {
             options.param(DataProcessorRequest.LOCALE_ID_PARAM, String.valueOf(surveyedLocaleId));
         }
-        com.google.appengine.api.taskqueue.Queue queue = com.google.appengine.api.taskqueue.QueueFactory
-                .getQueue("background-processing");
-        queue.add(options);
+        QueueFactory.getQueue("background-processing").add(options);
+    }
+
+    public static void queueSynchronizedSummaryUpdate(SurveyInstance si, boolean increment) {
+        TaskOptions to = TaskOptions.Builder
+                .withUrl("/app_worker/dataprocessor")
+                .param(DataProcessorRequest.ACTION_PARAM,
+                        DataProcessorRequest.UPDATE_SURVEY_INSTANCE_SUMMARIES)
+                .param(DataProcessorRequest.SURVEY_INSTANCE_PARAM, si.getKey().getId() + "")
+                .param(DataProcessorRequest.DELTA_PARAM, increment ? "1":"-1");
+        QueueFactory.getQueue("surveyResponseCount").add(to);
+    }
+
+    public static void queueAdjustSurveyResponseCount(String key, boolean increment) {
+        TaskOptions to = TaskOptions.Builder
+                .withUrl("/app_worker/dataprocessor")
+                .param(DataProcessorRequest.ACTION_PARAM,
+                        DataProcessorRequest.SURVEY_RESPONSE_COUNT)
+                .param(DataProcessorRequest.COUNTER_ID_PARAM, key)
+                .param(DataProcessorRequest.DELTA_PARAM, increment ? "1":"-1");
+        QueueFactory.getQueue("surveyResponseCount").add(to);
     }
 
 }
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/EnvServlet.java b/GAE/src/org/waterforpeople/mapping/app/web/EnvServlet.java
index 9bded613a6..f7848096d2 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/EnvServlet.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/EnvServlet.java
@@ -143,7 +143,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
         if (props.get(CADDISFLY_TESTS_FILE_URL_KEY) == null
                 || props.get(CADDISFLY_TESTS_FILE_URL_KEY).isEmpty()) {
             props.put("caddisflyTestsFileUrl",
-                    "https://akvoflow-public.s3.amazonaws.com/caddisfly-tests.json");
+                    "https://s3-eu-west-1.amazonaws.com/akvoflow-public/caddisfly-tests-v2.json");
         }
 
         // load language configuration and strings if present
@@ -165,7 +165,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
         final List<Map<String, String>> roles = new ArrayList<Map<String, String>>();
         for (AppRole r : AppRole.values()) {
             if (r.getLevel() < 10) {
-                continue; // don't expose NEW_USER, nor SUPER_USER
+                continue; // don't expose ROLE_NEW_USER, nor ROLE_SUPER_USER
             }
             Map<String, String> role = new HashMap<String, String>();
             role.put("value", String.valueOf(r.getLevel()));
@@ -190,15 +190,17 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
      * @param props
      */
     private void addLocale(Map<String, String> props) {
-        final com.google.appengine.api.users.User currentGoogleUser = UserServiceFactory
-                .getUserService().getCurrentUser();
+        final com.google.appengine.api.users.User currentGoogleUser =
+                UserServiceFactory.getUserService().getCurrentUser();
         if (currentGoogleUser != null && currentGoogleUser.getEmail() != null) {
             final User currentUser = new UserDao().findUserByEmail(currentGoogleUser.getEmail());
-            final String locale = currentUser.getLanguage();
-            if (locale != null) {
-                props.put("locale", locale);
-            } else {
-                props.put("locale", "en");
+            if (currentUser != null) {
+                final String locale = currentUser.getLanguage();
+                if (locale != null) {
+                    props.put("locale", locale);
+                } else {
+                    props.put("locale", "en");
+                }
             }
         }
     }
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/ProcessorServlet.java b/GAE/src/org/waterforpeople/mapping/app/web/ProcessorServlet.java
index 1ca3e2158f..bf21e62a38 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/ProcessorServlet.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/ProcessorServlet.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010,2012-2016,2018 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010,2012-2016,2018-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -40,35 +40,42 @@
 import java.util.logging.Logger;
 
 /**
- * Servlet used by app to trigger processing of new survey data TODO: move parameter name strings
- * into constants
+ * Servlet used by app to trigger processing of new survey data
  */
 public class ProcessorServlet extends HttpServlet {
 
     private static final long serialVersionUID = -7062679258542909086L;
-    private static final Logger log = Logger.getLogger(ProcessorServlet.class
-            .getName());
+    private static final Logger log = Logger.getLogger(ProcessorServlet.class.getName());
+    
+    private static final String ACTION_PARAM = "action";
+    private static final String SUBMIT_ACTION = "submit";
+    private static final String IMAGE_ACTION = "image";
+    private static final String CASCADE_ACTION = "cascade";
+    private static final String CHECKSUM_PARAM = "checksum";
+    private static final String IMEI_PARAM = "imei";
+    private static final String ANDROID_ID_PARAM = "androidId";
+    private static final String PHONE_NUMBER_PARAM = "phoneNumber";
+    private static final String FILE_NAME_PARAM = "fileName";
 
     @Override
-    public void doGet(HttpServletRequest req, HttpServletResponse resp)
-            throws IOException {
-        if (req.getParameter("action") == null) {
+    public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        
+        String action = StringUtils.trim(req.getParameter(ACTION_PARAM));
+        if (action == null) {
             log.info("No action specified for processor");
             return;
         }
+        log.info("  ProcessorServlet->action->" + action);
 
-        String action = StringUtils.trim(req.getParameter("action"));
-        String fileName = StringUtils.trim(req.getParameter("fileName"));
-        String phoneNumber = StringUtils.trim(req.getParameter("phoneNumber"));
-        String androidId = StringUtils.trim(req.getParameter("androidId"));
-        String imei = StringUtils.trim(req.getParameter("imei"));
-        String checksum = StringUtils.trim(req.getParameter("checksum"));
+        String fileName = StringUtils.trim(req.getParameter(FILE_NAME_PARAM));
+        String phoneNumber = StringUtils.trim(req.getParameter(PHONE_NUMBER_PARAM));
+        String androidId = StringUtils.trim(req.getParameter(ANDROID_ID_PARAM));
+        String imei = StringUtils.trim(req.getParameter(IMEI_PARAM));
+        String checksum = StringUtils.trim(req.getParameter(CHECKSUM_PARAM));
 
-        log.info("	ProcessorServlet->action->" + action);
-
-        if (action.equals("submit")) {
+        if (SUBMIT_ACTION.equals(action)) {
             if (fileName == null) {
-                log.info("Request for processing without filename: phoneNumber=(" + phoneNumber
+                log.warning("Request for processing without filename: phoneNumber=(" + phoneNumber
                         + "); IMEI=(" + imei + ")");
                 resp.setStatus(HttpServletResponse.SC_BAD_REQUEST);
                 return;
@@ -86,9 +93,9 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp)
             }
 
             log.info("  ProcessorServlet->filename->" + fileName);
-            log.info("about to submit task for fileName: " + fileName);
             // Submit the fileName for processing
-            Queue queue = QueueFactory.getDefaultQueue();
+            // on a single-instance queue to prevent race conditions
+            Queue queue = QueueFactory.getQueue("processDeviceFile");
             TaskOptions options = TaskOptions.Builder.withUrl("/app_worker/task")
                     .param(TaskRequest.ACTION_PARAM, TaskRequest.PROCESS_FILE_ACTION)
                     .param(TaskRequest.FILE_NAME_PARAM, fileName);
@@ -96,15 +103,12 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp)
             if (androidId != null) {
                 options.param(TaskRequest.ANDROID_ID, androidId);
             }
-
             if (phoneNumber != null) {
                 options.param(TaskRequest.PHONE_NUM_PARAM, phoneNumber);
             }
-
             if (imei != null) {
                 options.param(TaskRequest.IMEI_PARAM, imei);
             }
-
             if (checksum != null) {
                 options.param(TaskRequest.CHECKSUM_PARAM, checksum);
             }
@@ -113,7 +117,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp)
 
             log.info("submiting task for fileName: " + fileName);
 
-        } else if (action.equals("image")) {
+        } else if (IMAGE_ACTION.equals(action)) {
             Device d = null;
             DeviceDAO dao = new DeviceDAO();
 
@@ -126,13 +130,13 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp)
             }
 
             DeviceFileJobQueueDAO dfDao = new DeviceFileJobQueueDAO();
-            List<DeviceFileJobQueue> missing = dfDao.listByDeviceAndFile(d
-                    .getKey().getId(), fileName);
+            List<DeviceFileJobQueue> missing = dfDao.listByDeviceAndFile(
+                    d.getKey().getId(), fileName);
             log.info(String.format(
                     "Deleting %s entities matching the fileName %s",
                     missing.size(), fileName));
             dfDao.delete(missing);
-        } else if (action.equals("cascade")) {
+        } else if (CASCADE_ACTION.equals(action)) {
             Long crId = null;
             final String status = StringUtils.trim(req.getParameter("status"));
             final String message = StringUtils.trim(req.getParameter("message"));
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/PublishSurveyServlet.java b/GAE/src/org/waterforpeople/mapping/app/web/PublishSurveyServlet.java
deleted file mode 100644
index 317feb1560..0000000000
--- a/GAE/src/org/waterforpeople/mapping/app/web/PublishSurveyServlet.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  Copyright (C) 2013 Stichting Akvo (Akvo Foundation)
- *
- *  This file is part of Akvo FLOW.
- *
- *  Akvo FLOW is free software: you can redistribute it and modify it under the terms of
- *  the GNU Affero General Public License (AGPL) as published by the Free Software Foundation,
- *  either version 3 of the License or any later version.
- *
- *  Akvo FLOW is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *  See the GNU Affero General Public License included below for more details.
- *
- *  The full license text can also be seen at <http://www.gnu.org/licenses/agpl.html>.
- */
-
-package org.waterforpeople.mapping.app.web;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.waterforpeople.mapping.app.gwt.server.survey.SurveyServiceImpl;
-
-public class PublishSurveyServlet extends HttpServlet {
-
-    private static final long serialVersionUID = -8625535651028940339L;
-
-    @Override
-    protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-            throws ServletException, IOException {
-        final String surveyId = req.getParameter("surveyId");
-        final PrintWriter pw = resp.getWriter();
-        if (surveyId == null || "".equals(surveyId)) {
-            pw.write("surveyId parameter is required");
-            return;
-        }
-        new SurveyServiceImpl().publishSurveyAsync(Long.valueOf(surveyId));
-        pw.write("Request processed. Check [View Messages] in the Dashboard");
-    }
-
-}
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/RawDataRestServlet.java b/GAE/src/org/waterforpeople/mapping/app/web/RawDataRestServlet.java
index 95e9f342f9..17a8d3d09f 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/RawDataRestServlet.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/RawDataRestServlet.java
@@ -28,7 +28,6 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.waterforpeople.mapping.app.gwt.client.survey.QuestionDto.QuestionType;
-import org.waterforpeople.mapping.app.gwt.server.surveyinstance.SurveyInstanceServiceImpl;
 import org.waterforpeople.mapping.app.web.dto.DataProcessorRequest;
 import org.waterforpeople.mapping.app.web.dto.RawDataImportRequest;
 import org.waterforpeople.mapping.dao.QuestionAnswerStoreDao;
@@ -37,7 +36,6 @@
 import org.waterforpeople.mapping.domain.SurveyInstance;
 
 import com.gallatinsystems.common.Constants;
-import com.gallatinsystems.common.util.PropertyUtil;
 import com.gallatinsystems.framework.rest.AbstractRestApiServlet;
 import com.gallatinsystems.framework.rest.RestRequest;
 import com.gallatinsystems.framework.rest.RestResponse;
@@ -54,7 +52,6 @@
 import com.gallatinsystems.surveyal.app.web.SurveyalRestRequest;
 import com.gallatinsystems.surveyal.dao.SurveyedLocaleDao;
 import com.gallatinsystems.surveyal.domain.SurveyedLocale;
-import com.google.appengine.api.backends.BackendServiceFactory;
 import com.google.appengine.api.datastore.KeyFactory;
 import com.google.appengine.api.taskqueue.Queue;
 import com.google.appengine.api.taskqueue.QueueFactory;
@@ -64,6 +61,13 @@ public class RawDataRestServlet extends AbstractRestApiServlet {
     private static final Logger log = Logger.getLogger("RawDataRestServlet");
     private static final long serialVersionUID = 2409014651721639814L;
 
+    private static final String DATA_SUMMARIZATION_QUEUE = "dataSummarization";
+    private static final String DATA_SUMMARIZATION_URL = "/app_worker/datasummarization";
+    private static final String SURVEYAL_URL = "/app_worker/surveyalservlet";
+    private static final String OBJECT_KEY_PARAM = "objectKey";
+    private static final String TYPE_PARAM = "type";
+    private static final String SI_TYPE = "SurveyInstance";
+
     private SurveyInstanceDAO instanceDao;
     private SurveyDAO sDao;
     private SurveyGroupDAO sgDao;
@@ -90,7 +94,6 @@ protected RestRequest convertRequest() throws Exception {
 
     @Override
     protected RestResponse handleRequest(RestRequest req) throws Exception {
-        SurveyInstanceServiceImpl sisi = new SurveyInstanceServiceImpl();
         RawDataImportRequest importReq = (RawDataImportRequest) req;
         if (RawDataImportRequest.SAVE_SURVEY_INSTANCE_ACTION.equals(importReq.getAction())) {
 
@@ -229,8 +232,9 @@ protected RestResponse handleRequest(RestRequest req) throws Exception {
                 locale.setIdentifier(SurveyedLocale.generateBase32Uuid());
                 instance.setSurveyedLocaleIdentifier(locale.getIdentifier());
 
-                String privacyLevel = sg.getPrivacyLevel() != null ? sg.getPrivacyLevel()
-                        .toString() : SurveyGroup.PrivacyLevel.PRIVATE.toString();
+                String privacyLevel = sg.getPrivacyLevel() != null
+                        ? sg.getPrivacyLevel().toString()
+                        : SurveyGroup.PrivacyLevel.PRIVATE.toString();
                 locale.setLocaleType(privacyLevel);
                 locale.setSurveyGroupId(sg.getKey().getId());
                 locale.setCreationSurveyId(s.getKey().getId());
@@ -254,11 +258,9 @@ protected RestResponse handleRequest(RestRequest req) throws Exception {
             }
         } else if (RawDataImportRequest.RESET_SURVEY_INSTANCE_ACTION
                 .equals(importReq.getAction())) {
-            SurveyInstance instance = instanceDao.getByKey(importReq
-                    .getSurveyInstanceId());
+            SurveyInstance instance = instanceDao.getByKey(importReq.getSurveyInstanceId());
             List<QuestionAnswerStore> oldAnswers = instanceDao
-                    .listQuestionAnswerStore(importReq.getSurveyInstanceId(),
-                            null);
+                    .listQuestionAnswerStore(importReq.getSurveyInstanceId(), null);
 
             if (oldAnswers != null && oldAnswers.size() > 0) {
                 instanceDao.delete(oldAnswers);
@@ -318,16 +320,13 @@ protected RestResponse handleRequest(RestRequest req) throws Exception {
                         .listQuestionsBySurvey(importReq.getSurveyId());
 
                 if (questionList != null
-                        && questionList.size() >= importReq
-                                .getFixedFieldValues().size()) {
+                        && questionList.size() >= importReq.getFixedFieldValues().size()) {
                     List<QuestionAnswerStore> answers = new ArrayList<QuestionAnswerStore>();
                     for (int i = 0; i < importReq.getFixedFieldValues().size(); i++) {
                         String val = importReq.getFixedFieldValues().get(i);
                         if (val != null && val.trim().length() > 0) {
                             QuestionAnswerStore ans = new QuestionAnswerStore();
-                            ans.setQuestionID(questionList.get(i).getKey()
-                                    .getId()
-                                    + "");
+                            ans.setQuestionID(questionList.get(i).getKey().getId() + "");
                             ans.setValue(val);
                             Type type = questionList.get(i).getType();
                             if (Type.GEO == type) {
@@ -338,8 +337,7 @@ protected RestResponse handleRequest(RestRequest req) throws Exception {
                                 ans.setType("VALUE");
                             }
                             ans.setSurveyId(importReq.getSurveyId());
-                            ans.setSurveyInstanceId(importReq
-                                    .getSurveyInstanceId());
+                            ans.setSurveyInstanceId(importReq.getSurveyInstanceId());
                             ans.setCollectionDate(importReq.getCollectionDate());
                             answers.add(ans);
                         }
@@ -347,12 +345,11 @@ protected RestResponse handleRequest(RestRequest req) throws Exception {
                     if (answers.size() > 0) {
                         QuestionAnswerStoreDao qasDao = new QuestionAnswerStoreDao();
                         qasDao.save(answers);
-                        sisi.sendProcessingMessages(inst);
+                        sendProcessingMessages(inst);
                     }
 
                 } else {
-                    log("No questions found for the survey id "
-                            + importReq.getSurveyId());
+                    log("No questions found for the survey id " + importReq.getSurveyId());
                 }
                 // todo: send processing message
             }
@@ -370,19 +367,9 @@ protected RestResponse handleRequest(RestRequest req) throws Exception {
                     .withUrl("/app_worker/dataprocessor")
                     .param(DataProcessorRequest.ACTION_PARAM,
                             DataProcessorRequest.REBUILD_QUESTION_SUMMARY_ACTION)
-                    .param(DataProcessorRequest.SURVEY_ID_PARAM, importReq.getSurveyId().toString());
-
-            String backendPub = PropertyUtil.getProperty("backendpublish");
-            if (backendPub != null && "true".equals(backendPub)) {
-                // change the host so the queue invokes the backend
-                options = options
-                        .header("Host",
-                                BackendServiceFactory.getBackendService()
-                                        .getBackendAddress("dataprocessor"));
-            }
-
-            com.google.appengine.api.taskqueue.Queue queue = com.google.appengine.api.taskqueue.QueueFactory
-                    .getDefaultQueue();
+                    .param(DataProcessorRequest.SURVEY_ID_PARAM,
+                            importReq.getSurveyId().toString());
+            com.google.appengine.api.taskqueue.Queue queue = QueueFactory.getDefaultQueue();
             queue.add(options);
         } else if (RawDataImportRequest.SAVE_MESSAGE_ACTION
                 .equalsIgnoreCase(importReq.getAction())) {
@@ -415,6 +402,20 @@ private void updateDataPointLocation(SurveyedLocale dataPoint,
         }
     }
 
+    private void sendProcessingMessages(SurveyInstance domain) {
+        // send async request to summarize the instance
+        QueueFactory.getQueue(DATA_SUMMARIZATION_QUEUE).add(
+                TaskOptions.Builder.withUrl(DATA_SUMMARIZATION_URL)
+                        .param(OBJECT_KEY_PARAM, domain.getKey().getId() + "")
+                        .param(TYPE_PARAM, SI_TYPE));
+        QueueFactory.getDefaultQueue().add(
+                TaskOptions.Builder.withUrl(SURVEYAL_URL)
+                        .param(SurveyalRestRequest.ACTION_PARAM,
+                                SurveyalRestRequest.INGEST_INSTANCE_ACTION)
+                        .param(SurveyalRestRequest.SURVEY_INSTANCE_PARAM,
+                                domain.getKey().getId() + ""));
+    }
+
     /**
      * constructs and persists a new surveyInstance using the data from the import request
      *
@@ -425,9 +426,9 @@ private SurveyInstance createInstance(RawDataImportRequest importReq) {
         SurveyInstance inst = new SurveyInstance();
         inst.setUserID(1L);
         inst.setSurveyId(importReq.getSurveyId());
-        inst.setCollectionDate(importReq.getCollectionDate() != null 
-        		? importReq.getCollectionDate()
-        		: new Date());
+        inst.setCollectionDate(importReq.getCollectionDate() != null
+                ? importReq.getCollectionDate()
+                : new Date());
         inst.setDeviceIdentifier("IMPORTER");
         inst.setUuid(UUID.randomUUID().toString());
         inst.setSurveyedLocaleId(importReq.getSurveyedLocaleId());
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/SurveyAssemblyServlet.java b/GAE/src/org/waterforpeople/mapping/app/web/SurveyAssemblyServlet.java
index c99aebeef4..99c1b84611 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/SurveyAssemblyServlet.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/SurveyAssemblyServlet.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2017 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2017, 2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -25,6 +25,8 @@
 import com.gallatinsystems.framework.rest.RestResponse;
 import com.gallatinsystems.messaging.dao.MessageDao;
 import com.gallatinsystems.messaging.domain.Message;
+import com.gallatinsystems.operations.dao.ProcessingStatusDao;
+import com.gallatinsystems.operations.domain.ProcessingStatus;
 import com.gallatinsystems.survey.dao.*;
 import com.gallatinsystems.survey.domain.*;
 import com.gallatinsystems.survey.domain.Question;
@@ -33,7 +35,6 @@
 import com.gallatinsystems.survey.domain.SurveyXMLFragment.FRAGMENT_TYPE;
 import com.gallatinsystems.survey.domain.xml.*;
 import com.gallatinsystems.survey.xml.SurveyXMLAdapter;
-import com.google.appengine.api.backends.BackendServiceFactory;
 import com.google.appengine.api.datastore.Text;
 import com.google.appengine.api.taskqueue.Queue;
 import com.google.appengine.api.taskqueue.QueueFactory;
@@ -50,6 +51,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -60,8 +62,6 @@ public class SurveyAssemblyServlet extends AbstractRestApiServlet {
     private static final Logger log = Logger
             .getLogger(SurveyAssemblyServlet.class.getName());
 
-    private static final int BACKEND_QUESTION_THRESHOLD = 80;
-    private static final String BACKEND_PUBLISH_PROP = "backendpublish";
     private static final long serialVersionUID = -6044156962558183224L;
     private static final String OPTION_RENDER_MODE_PROP = "optionRenderMode";
     public static final String FREE_QUESTION_TYPE = "free";
@@ -79,6 +79,8 @@ public class SurveyAssemblyServlet extends AbstractRestApiServlet {
 
     private static final String SURVEY_UPLOAD_URL = "surveyuploadurl";
     private static final String SURVEY_UPLOAD_DIR = "surveyuploaddir";
+    private static final String FORM_PUB_STATUS_KEY = "formPublication";
+    
 
     private Random randomNumber = new Random();
 
@@ -89,52 +91,50 @@ protected RestRequest convertRequest() throws Exception {
         restRequest.populateFromHttpRequest(req);
         return restRequest;
     }
-
+    
+    
     @Override
     protected RestResponse handleRequest(RestRequest req) throws Exception {
         RestResponse response = new RestResponse();
         SurveyAssemblyRequest importReq = (SurveyAssemblyRequest) req;
         if (SurveyAssemblyRequest.ASSEMBLE_SURVEY.equalsIgnoreCase(importReq.getAction())) {
-
-            QuestionDao questionDao = new QuestionDao();
-            boolean useBackend = false;
-            // make sure we're not already running on a backend and that we are
-            // allowed to use one
-            if (!importReq.getIsForwarded()
-                    && "true".equalsIgnoreCase(PropertyUtil
-                            .getProperty(BACKEND_PUBLISH_PROP))) {
-                // if we're allowed to use a backend, then check to see if we
-                // need to (based on survey size)
-                List<Question> questionList = questionDao
-                        .listQuestionsBySurvey(importReq.getSurveyId());
-                if (questionList != null && questionList.size() > BACKEND_QUESTION_THRESHOLD) {
-                    useBackend = true;
-                }
+            Date start = new Date();
+            Long id = importReq.getSurveyId();
+            //Instrumentation
+            ProcessingStatusDao statusDao = new ProcessingStatusDao();
+            ProcessingStatus status = statusDao.getStatusByCode(
+                    FORM_PUB_STATUS_KEY + (id != null ? ":" + id : ""));
+            if (status == null) {
+                status = new ProcessingStatus();
+                status.setCode(FORM_PUB_STATUS_KEY + (id != null ? ":" + id : ""));
+                status.setMaxDurationMs(0L);
             }
-            if (useBackend) {
-                log.info("Forking to task for long assembly");
-                com.google.appengine.api.taskqueue.TaskOptions options = com.google.appengine.api.taskqueue.TaskOptions.Builder
-                        .withUrl("/app_worker/surveyassembly")
-                        .param(SurveyAssemblyRequest.ACTION_PARAM,
-                                SurveyAssemblyRequest.ASSEMBLE_SURVEY)
-                        .param(SurveyAssemblyRequest.IS_FWD_PARAM, "true")
-                        .param(SurveyAssemblyRequest.SURVEY_ID_PARAM,
-                                importReq.getSurveyId().toString());
-                // change the host so the queue invokes the backend
-                options = options
-                        .header("Host",
-                                BackendServiceFactory.getBackendService()
-                                        .getBackendAddress("dataprocessor"));
-                com.google.appengine.api.taskqueue.Queue queue = com.google.appengine.api.taskqueue.QueueFactory
-                        .getQueue("surveyAssembly");
-                queue.add(options);
-            } else {
-                assembleSurveyOnePass(importReq.getSurveyId());
+            status.setLastEventDate(start);
+            Long maxDuration = status.getMaxDurationMs();
+            if (maxDuration == null) {
+                maxDuration = 0L;
             }
+            status.setInError(true); //In case it never saves an end sts
+            status.setValue("inProgress");
+            statusDao.save(status);
 
+            //Need to keep this shorter than task queue limit (600s)
+            boolean ok = assembleSurveyOnePass(importReq.getSurveyId());
+            //Clear caches
             List<Long> ids = new ArrayList<Long>();
-            ids.add(importReq.getSurveyId());
+            ids.add(id);
             SurveyUtils.notifyReportService(ids, "invalidate");
+            
+            // now update the status
+            status.setInError(ok);
+            status.setValue("finished");
+            Long duration = new Date().getTime() - start.getTime();
+            if (duration > maxDuration) {
+                status.setMaxDurationMs(duration);
+                status.setMaxDurationDate(start);
+            }
+            statusDao.save(status);
+
 
         } else if (SurveyAssemblyRequest.DISPATCH_ASSEMBLE_QUESTION_GROUP
                 .equalsIgnoreCase(importReq.getAction())) {
@@ -143,20 +143,39 @@ protected RestResponse handleRequest(RestRequest req) throws Exception {
                     importReq.getTransactionId());
         } else if (SurveyAssemblyRequest.ASSEMBLE_QUESTION_GROUP
                 .equalsIgnoreCase(importReq.getAction())) {
-            assembleQuestionGroups(importReq.getSurveyId(),
-                    importReq.getTransactionId());
-        } else if (SurveyAssemblyRequest.DISTRIBUTE_SURVEY
+            assembleQuestionGroups(importReq.getSurveyId(), importReq.getTransactionId());
+        } else if (SurveyAssemblyRequest.DISTRIBUTE_SURVEY //Punt upload to another task
                 .equalsIgnoreCase(importReq.getAction())) {
             uploadSurvey(importReq.getSurveyId(), importReq.getTransactionId());
-        } else if (SurveyAssemblyRequest.CLEANUP.equalsIgnoreCase(importReq
-                .getAction())) {
-            cleanupFragments(importReq.getSurveyId(),
-                    importReq.getTransactionId());
+        } else if (SurveyAssemblyRequest.CLEANUP.equalsIgnoreCase(importReq.getAction())) {
+            cleanupFragments(importReq.getSurveyId(), importReq.getTransactionId());
         }
 
         return response;
     }
 
+    // Manual triggering of publication should start here
+    static public void runAsTask(Long surveyId) {
+        log.info("Forking to task for long assembly");
+        TaskOptions options = TaskOptions.Builder
+                .withUrl("/app_worker/surveyassembly")
+                .param(SurveyAssemblyRequest.ACTION_PARAM,
+                        SurveyAssemblyRequest.ASSEMBLE_SURVEY)
+                .param(SurveyAssemblyRequest.SURVEY_ID_PARAM, surveyId.toString());
+        Queue queue = QueueFactory.getQueue("surveyAssembly");
+        queue.add(options);
+        
+        Survey s = new SurveyDAO().getById(surveyId);
+        SurveyGroup sg = s != null ? new SurveyGroupDAO().getByKey(s.getSurveyGroupId()) : null;
+        if (sg != null && sg.getNewLocaleSurveyId() != null &&
+                sg.getNewLocaleSurveyId().longValue() == surveyId.longValue()) {
+            // This is the registration form. Schedule datapoint name re-assembly
+            DataProcessorRestServlet.scheduleDatapointNameAssembly(sg.getKey().getId(), null);
+        }
+
+    }
+
+
     /**
      * uploads full survey XML to S3
      *
@@ -191,7 +210,7 @@ private void uploadSurvey(Long surveyId, Long transactionId) {
             log.error("Error uploading zip file: " + e.getMessage(), e);
         }
 
-        sendQueueMessage(SurveyAssemblyRequest.CLEANUP, surveyId, null,
+        queueAssemblyTask(SurveyAssemblyRequest.CLEANUP, surveyId, null,
                 transactionId);
 
         Message message = new Message();
@@ -244,7 +263,11 @@ protected void writeOkResponse(RestResponse resp) throws Exception {
         httpResp.flushBuffer();
     }
 
-    private void assembleSurveyOnePass(Long surveyId) {
+    /*
+     * One-pass assembly. May take too long for a single task if there are many questions.
+     * Upload to S3 might also be time-consuming.
+     */
+    private boolean assembleSurveyOnePass(Long surveyId) {
         log.info("Starting assembly of " + surveyId);
         // Swap with proper UUID
         SurveyDAO surveyDao = new SurveyDAO();
@@ -279,8 +302,12 @@ private void assembleSurveyOnePass(Long surveyId) {
                 + registrationForm + " " + surveyGroupId + " " + surveyGroupName + " "
                 + surveyIdKeyValue + ">";
         String surveyFooter = "</survey>";
+
+        //Get groups, with order as key
         QuestionGroupDao qgDao = new QuestionGroupDao();
         TreeMap<Integer, QuestionGroup> qgList = qgDao.listQuestionGroupsBySurvey(surveyId);
+        
+        boolean uploadOk = false;
         if (qgList != null) {
             StringBuilder surveyXML = new StringBuilder();
             surveyXML.append(surveyHeader);
@@ -292,9 +319,9 @@ private void assembleSurveyOnePass(Long surveyId) {
             surveyXML.append(surveyFooter);
             log.info("Uploading " + surveyId);
             UploadStatusContainer uc = uploadSurveyXML(
-            		Long.toString(surveyId), //latest version in plain filename
-            		Long.toString(surveyId) + "v" + s.getVersion(), //archive copy
-            		surveyXML.toString());
+                    Long.toString(surveyId), //latest version in plain filename
+                    Long.toString(surveyId) + "v" + s.getVersion(), //archive copy
+                    surveyXML.toString());
             Message message = new Message();
             message.setActionAbout("surveyAssembly");
             message.setObjectId(surveyId);
@@ -308,6 +335,7 @@ private void assembleSurveyOnePass(Long surveyId) {
                 message.setTransactionUUID(transactionId.toString());
                 MessageDao messageDao = new MessageDao();
                 messageDao.save(message);
+                uploadOk = true;
             } else {
                 String messageText = "Failed to publish: " + surveyId + "\n" + uc.getMessage();
                 message.setTransactionUUID(transactionId.toString());
@@ -319,9 +347,9 @@ private void assembleSurveyOnePass(Long surveyId) {
             }
             log.info("Completed survey assembly for " + surveyId);
         }
+        return uploadOk;
     }
 
-    
     /**  Upload a zipped file twice to S3 under different filenames.
      * @param fileName1
      * @param fileName2
@@ -341,7 +369,7 @@ public UploadStatusContainer uploadSurveyXML(String fileName1, String fileName2,
                 + "/" + fileName1 + ".xml");
         return uc;
     }
-    
+
     private boolean uploadZippedXml(String content, String bucketName, String directory, String fileName) {
         ByteArrayOutputStream os2 = ZipUtil.generateZip(content, fileName + ".xml");
 
@@ -362,7 +390,7 @@ public String buildQuestionGroupXML(QuestionGroup item) {
         QuestionGroupDao questionGroupDao = new QuestionGroupDao();
         QuestionGroup group = questionGroupDao.getByKey(item.getKey().getId());
         TreeMap<Integer, Question> questionList = questionDao
-                .listQuestionsByQuestionGroup(item.getKey().getId(), true);
+                .listQuestionsByQuestionGroup(item.getKey().getId(), true); //with option details
 
         StringBuilder sb = new StringBuilder("<questionGroup")
                 .append(Boolean.TRUE.equals(group.getRepeatable()) ? " repeatable=\"true\"" : "")
@@ -378,13 +406,13 @@ public String buildQuestionGroupXML(QuestionGroup item) {
     }
 
     /**
-     * sends a message to the task queue for survey assembly
+     * sends a subtask to the task queue for survey assembly
      *
      * @param action
      * @param surveyId
      * @param questionGroups
      */
-    private void sendQueueMessage(String action, Long surveyId,
+    private void queueAssemblyTask(String action, Long surveyId,
             String questionGroups, Long transactionId) {
         Queue surveyAssemblyQueue = QueueFactory.getQueue("surveyAssembly");
         TaskOptions task = TaskOptions.Builder
@@ -400,6 +428,7 @@ private void sendQueueMessage(String action, Long surveyId,
         surveyAssemblyQueue.add(task);
     }
 
+    
     private void dispatchAssembleQuestionGroup(Long surveyId,
             String questionGroupIds, Long transactionId) {
         boolean isLast = true;
@@ -413,8 +442,7 @@ private void dispatchAssembleQuestionGroup(Long surveyId,
 
         QuestionDao questionDao = new QuestionDao();
         QuestionGroupDao questionGroupDao = new QuestionGroupDao();
-        QuestionGroup group = questionGroupDao.getByKey(Long
-                .parseLong(currentId));
+        QuestionGroup group = questionGroupDao.getByKey(Long.parseLong(currentId));
         TreeMap<Integer, Question> questionList = questionDao
                 .listQuestionsByQuestionGroup(Long.parseLong(currentId), true);
 
@@ -439,16 +467,21 @@ private void dispatchAssembleQuestionGroup(Long surveyId,
         sxmlfDao.save(sxf);
         if (isLast) {
             // Assemble the fragments
-            sendQueueMessage(SurveyAssemblyRequest.ASSEMBLE_QUESTION_GROUP,
+            queueAssemblyTask(SurveyAssemblyRequest.ASSEMBLE_QUESTION_GROUP,
                     surveyId, null, transactionId);
 
         } else {
-            sendQueueMessage(
+            queueAssemblyTask(
                     SurveyAssemblyRequest.DISPATCH_ASSEMBLE_QUESTION_GROUP,
                     surveyId, remainingIds, transactionId);
         }
     }
 
+    
+    /** Express a question and any subitems as XML
+     * @param q
+     * @return
+     */
     private String marshallQuestion(Question q) {
 
         SurveyXMLAdapter sax = new SurveyXMLAdapter();
@@ -528,7 +561,7 @@ private String marshallQuestion(Question q) {
         }
 
         boolean hasValidation = false;
-       if (q.getType() == Question.Type.NUMBER
+        if (q.getType() == Question.Type.NUMBER
                 && (q.getAllowDecimal() != null || q.getAllowSign() != null
                         || q.getMinVal() != null || q.getMaxVal() != null)) {
             ValidationRule validationRule = objFactory.createValidationRule();
@@ -742,6 +775,10 @@ private List<AltText> formAltText(Map<String, Translation> translationMap) {
         return altTextList;
     }
 
+    /** Assemble survey from QG fragments in the datastore.
+     * @param surveyId
+     * @param transactionId
+     */
     private void assembleQuestionGroups(Long surveyId, Long transactionId) {
         SurveyXMLFragmentDao sxmlfDao = new SurveyXMLFragmentDao();
         List<SurveyXMLFragment> sxmlfList = sxmlfDao.listSurveyFragments(
@@ -769,6 +806,6 @@ private void assembleQuestionGroups(Long surveyId, Long transactionId) {
 
         scDao.save(sc);
 
-        sendQueueMessage(SurveyAssemblyRequest.DISTRIBUTE_SURVEY, surveyId, null, transactionId);
+        queueAssemblyTask(SurveyAssemblyRequest.DISTRIBUTE_SURVEY, surveyId, null, transactionId);
     }
 }
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/SurveyInstanceServlet.java b/GAE/src/org/waterforpeople/mapping/app/web/SurveyInstanceServlet.java
index 9aaf52b691..33826a55df 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/SurveyInstanceServlet.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/SurveyInstanceServlet.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2017 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -21,8 +21,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import org.akvo.flow.util.FlowJsonObjectWriter;
 import org.springframework.beans.BeanUtils;
 import org.waterforpeople.mapping.app.gwt.client.surveyinstance.SurveyInstanceDto;
 import org.waterforpeople.mapping.app.web.dto.InstanceDataDto;
@@ -209,8 +208,7 @@ private String buildLatestApprovalStatus(ApprovalStep latestApprovalStep,
     @Override
     protected void writeOkResponse(RestResponse response) throws Exception {
         getResponse().setStatus(200);
-        ObjectMapper jsonMapper = new ObjectMapper();
-        jsonMapper.getSerializationConfig().setSerializationInclusion(Inclusion.NON_NULL);
-        jsonMapper.writeValue(getResponse().getWriter(), response);
+        FlowJsonObjectWriter writer = new FlowJsonObjectWriter().withExcludeNullValues();
+        writer.writeValue(getResponse().getOutputStream(), response);
     }
 }
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/SurveyRestServlet.java b/GAE/src/org/waterforpeople/mapping/app/web/SurveyRestServlet.java
index a08c4a59a5..f31d4d5c37 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/SurveyRestServlet.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/SurveyRestServlet.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2017 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -30,7 +30,7 @@
 
 import org.akvo.flow.domain.mapper.QuestionDtoMapper;
 import org.akvo.flow.domain.mapper.QuestionOptionDtoMapper;
-import org.codehaus.jackson.map.ObjectMapper;
+import org.akvo.flow.util.FlowJsonObjectWriter;
 import org.waterforpeople.mapping.analytics.dao.SurveyQuestionSummaryDao;
 import org.waterforpeople.mapping.analytics.domain.SurveyQuestionSummary;
 import org.waterforpeople.mapping.app.gwt.client.survey.QuestionDto;
@@ -280,8 +280,8 @@ private SurveyDto getSurvey(Long surveyId) {
     @Override
     protected void writeOkResponse(RestResponse resp) throws Exception {
         getResponse().setStatus(200);
-        new ObjectMapper().writeValue(getResponse().getWriter(), resp);
-
+        FlowJsonObjectWriter writer = new FlowJsonObjectWriter();
+        writer.writeValue(getResponse().getOutputStream(), resp);
     }
 
     /**
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/SurveyedLocaleServlet.java b/GAE/src/org/waterforpeople/mapping/app/web/SurveyedLocaleServlet.java
index 48e1b1dd27..942b0cb1c9 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/SurveyedLocaleServlet.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/SurveyedLocaleServlet.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2017 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -29,7 +29,7 @@
 import com.gallatinsystems.surveyal.domain.SurveyedLocale;
 import com.google.api.server.spi.config.Nullable;
 import org.akvo.flow.domain.DataUtils;
-import org.codehaus.jackson.map.ObjectMapper;
+import org.akvo.flow.util.FlowJsonObjectWriter;
 import org.waterforpeople.mapping.app.web.dto.SurveyInstanceDto;
 import org.waterforpeople.mapping.app.web.dto.SurveyedLocaleDto;
 import org.waterforpeople.mapping.app.web.dto.SurveyedLocaleRequest;
@@ -332,8 +332,8 @@ protected void writeOkResponse(RestResponse resp) throws Exception {
         }
         getResponse().setStatus(sc);
         if (sc == HttpServletResponse.SC_OK) {
-            ObjectMapper jsonMapper = new ObjectMapper();
-            jsonMapper.writeValue(getResponse().getWriter(), resp);
+            FlowJsonObjectWriter writer = new FlowJsonObjectWriter();
+            writer.writeValue(getResponse().getOutputStream(), resp);
             getResponse().getWriter().println();
         } else {
             getResponse().getWriter().println(resp.getMessage());
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/TaskServlet.java b/GAE/src/org/waterforpeople/mapping/app/web/TaskServlet.java
index 8e0dc274b3..01ebeaa256 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/TaskServlet.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/TaskServlet.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2015 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2015, 2018 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -198,6 +198,7 @@ private List<SurveyInstance> processFile(TaskRequest fileProcessTaskRequest) {
             for (SurveyInstance si : surveyInstances) {
                 synchronized (LOCK) {
                     // Synchronize datastore access.
+                    // Only locked against access by other threads in same process.
                     si = siDao.save(si, deviceFile);
                 }
                 // Fire a survey event
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/TestHarnessServlet.java b/GAE/src/org/waterforpeople/mapping/app/web/TestHarnessServlet.java
index 0a783a716b..abb88243c6 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/TestHarnessServlet.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/TestHarnessServlet.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2018 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -16,8 +16,6 @@
 
 package org.waterforpeople.mapping.app.web;
 
-import static com.gallatinsystems.common.util.MemCacheUtils.initCache;
-
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.Writer;
@@ -43,8 +41,6 @@
 import org.waterforpeople.mapping.domain.QuestionAnswerStore;
 import org.waterforpeople.mapping.domain.SurveyInstance;
 
-import com.beoui.geocell.GeocellManager;
-import com.beoui.geocell.model.Point;
 import com.gallatinsystems.framework.dao.BaseDAO;
 import com.gallatinsystems.gis.map.dao.OGRFeatureDao;
 import com.gallatinsystems.gis.map.domain.Geometry;
@@ -301,10 +297,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) {
                     .withUrl("/app_worker/dataprocessor")
                     .param(DataProcessorRequest.ACTION_PARAM,
                             DataProcessorRequest.POP_QUESTION_ORDER_FIELDS_ACTION)
-                    .param("cursor", "")
-                    .header("host",
-                            BackendServiceFactory.getBackendService().getBackendAddress(
-                                    "dataprocessor"));
+                    .param("cursor", "");
             if (req.getParameter("surveyId") != null) {
                 try {
                     // if we have a surveyId, try to parse it to long here
@@ -412,7 +405,7 @@ private void setupTestUser() {
             user.setEmailAddress("test@example.com");
         }
         user.setSuperAdmin(true);
-        user.setPermissionList(String.valueOf(AppRole.SUPER_ADMIN.getLevel()));
+        user.setPermissionList(String.valueOf(AppRole.ROLE_SUPER_ADMIN.getLevel()));
         user.setAccessKey(UUID.randomUUID().toString().replaceAll("-", ""));
         user.setSecret(UUID.randomUUID().toString().replaceAll("-", ""));
         userDao.save(user);
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/dto/ApprovalGroupDTO.java b/GAE/src/org/waterforpeople/mapping/app/web/dto/ApprovalGroupDTO.java
index b06978e11f..35ef9facc1 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/dto/ApprovalGroupDTO.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/dto/ApprovalGroupDTO.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2016 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2016,2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo Flow.
  *
@@ -16,7 +16,7 @@
 
 package org.waterforpeople.mapping.app.web.dto;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import com.gallatinsystems.framework.gwt.dto.client.BaseDto;
 import com.gallatinsystems.survey.domain.ApprovalGroup;
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/dto/ApprovalStepDTO.java b/GAE/src/org/waterforpeople/mapping/app/web/dto/ApprovalStepDTO.java
index ce4b3b42d6..8ac5e76c25 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/dto/ApprovalStepDTO.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/dto/ApprovalStepDTO.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2016 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2016,2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo Flow.
  *
@@ -18,7 +18,7 @@
 
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import com.gallatinsystems.framework.gwt.dto.client.BaseDto;
 import com.gallatinsystems.survey.domain.ApprovalStep;
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/dto/DataPointApprovalDTO.java b/GAE/src/org/waterforpeople/mapping/app/web/dto/DataPointApprovalDTO.java
index 022c3a097c..6460d4ec7a 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/dto/DataPointApprovalDTO.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/dto/DataPointApprovalDTO.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2016 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2016,2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo Flow.
  *
@@ -18,7 +18,7 @@
 
 import java.util.Date;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import com.gallatinsystems.framework.gwt.dto.client.BaseDto;
 import com.gallatinsystems.survey.domain.DataPointApproval;
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/dto/DataProcessorRequest.java b/GAE/src/org/waterforpeople/mapping/app/web/dto/DataProcessorRequest.java
index 0c7275dc24..5f7c251d02 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/dto/DataProcessorRequest.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/dto/DataProcessorRequest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2015 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2015, 2018,2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -66,13 +66,14 @@ public class DataProcessorRequest extends RestRequest {
     public static final String ADD_CREATION_SURVEY_ID_TO_LOCALE = "addCreationSurveyIdToLocale";
     public static final String ADD_TRANSLATION_FIELDS = "addTranslationFields";
     public static final String RECREATE_LOCALES = "recreateLocales";
+    public static final String CASCADE_RESOURCE_ID = "cascadeResourceId";
+    public static final String PARENT_NODE_ID = "parentNodeId";
     public static final String POP_QUESTION_ORDER_FIELDS_ACTION = "populateQuestionOrders";
     public static final String POPULATE_MONITORING_FIELDS_LOCALE_ACTION = "populateMonitoringFieldsLocale";
     public static final String CREATE_NEW_IDENTIFIERS_LOCALES_ACTION = "createNewIdentifiersLocales";
     public static final String DELETE_SURVEY_INSTANCE_ACTION = "deleteSurveyInstance";
-    public static final String DELETE_CASCADE_NODES = "deleteCascadeNodes";
-    public static final String CASCADE_RESOURCE_ID = "cascadeResourceId";
-    public static final String PARENT_NODE_ID = "parentNodeId";
+    public static final String DELETE_CHILD_CASCADE_NODES = "deleteCascadeNodes";
+    public static final String UPDATE_SURVEY_INSTANCE_SUMMARIES = "updateSurveyInstanceSummaries";
     public static final int MAX_TASK_RETRIES = 3;
 
     private String country;
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/dto/SurveyAssemblyRequest.java b/GAE/src/org/waterforpeople/mapping/app/web/dto/SurveyAssemblyRequest.java
index 02a6501f48..214cea3ee7 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/dto/SurveyAssemblyRequest.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/dto/SurveyAssemblyRequest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2012 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2012, 2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -37,7 +37,6 @@ public class SurveyAssemblyRequest extends RestRequest {
     public static final String CLEANUP = "cleanup";
 
     public static final String SURVEY_ID_PARAM = "surveyId";
-    public static final String IS_FWD_PARAM = "isFwd";
     private static final String START_ROW_PARAM = "startRow";
     private static final String GROUP_ID_PARAM = "questionGroupId";
     private static final String TRANSACTION_ID_PARAM = "transactionId";
@@ -49,7 +48,6 @@ public class SurveyAssemblyRequest extends RestRequest {
     private int startRow = 0;
     private String questionGroupId = null;
     private Long transactionId = null;
-    private Boolean isForwarded = false;
 
     public Long getTransactionId() {
         return transactionId;
@@ -98,9 +96,6 @@ protected void populateFields(HttpServletRequest req) throws Exception {
         if (req.getParameter(TRANSACTION_ID_PARAM) != null)
             setTransactionId(Long.parseLong(req
                     .getParameter(TRANSACTION_ID_PARAM)));
-        if (req.getParameter(IS_FWD_PARAM) != null) {
-            setIsForwarded(Boolean.parseBoolean(req.getParameter(IS_FWD_PARAM)));
-        }
     }
 
     public void setQuestionGroupId(String questionGroupId) {
@@ -119,12 +114,4 @@ public Boolean getLastGroupFlag() {
         return lastGroupFlag;
     }
 
-    public void setIsForwarded(Boolean isForwarded) {
-        this.isForwarded = isForwarded;
-    }
-
-    public Boolean getIsForwarded() {
-        return isForwarded;
-    }
-
 }
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/rest/ActionRestService.java b/GAE/src/org/waterforpeople/mapping/app/web/rest/ActionRestService.java
index 356eedebe4..010bd43969 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/rest/ActionRestService.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/rest/ActionRestService.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2013-2018 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2013-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -33,7 +33,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.waterforpeople.mapping.app.gwt.client.survey.SurveyDto;
-import org.waterforpeople.mapping.app.gwt.server.survey.SurveyServiceImpl;
+import org.waterforpeople.mapping.app.web.SurveyAssemblyServlet;
 import org.waterforpeople.mapping.app.web.dto.BootstrapGeneratorRequest;
 import org.waterforpeople.mapping.app.web.dto.DataProcessorRequest;
 import org.waterforpeople.mapping.app.web.rest.dto.RestStatusDto;
@@ -207,8 +207,7 @@ private String removeZeroMinMaxValues() {
 
 
     private String publishSurvey(Long surveyId) {
-        SurveyServiceImpl surveyService = new SurveyServiceImpl();
-        surveyService.publishSurveyAsync(surveyId);
+        SurveyAssemblyServlet.runAsTask(surveyId);
         return "publishing requested";
     }
 
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/rest/CascadeNodeRestService.java b/GAE/src/org/waterforpeople/mapping/app/web/rest/CascadeNodeRestService.java
index 9af155a357..db0ffb2e18 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/rest/CascadeNodeRestService.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/rest/CascadeNodeRestService.java
@@ -115,7 +115,7 @@ public Map<String, Object> saveExistingCascadeNode(@RequestBody
                     // copy the properties, except the createdDateTime property,
                     // because it is set in the Dao.
                     BeanUtils.copyProperties(cascadeNodeDto, cr,
-                    		new String[] {"createdDateTime"});
+                                new String[] {"createdDateTime"});
                     cr = cascadeNodeDao.save(cr);
                     dto = new CascadeNodeDto();
                     BeanUtils.copyProperties(cr, dto);
@@ -157,12 +157,12 @@ public Map<String, Object> saveNewCascadeNode(@RequestBody
     }
 
     private CascadeNodeDto createCascadeNode(CascadeNodeDto cascadeNodeDto){
-    	CascadeNode cn = new CascadeNode();
+        CascadeNode cn = new CascadeNode();
         BeanUtils.copyProperties(cascadeNodeDto, cn);
-    	cn = cascadeNodeDao.save(cn);
-    	CascadeNodeDto cnDto = new CascadeNodeDto();
-    	DtoMarshaller.copyToDto(cn,cnDto);
-    	return cnDto;
+        cn = cascadeNodeDao.save(cn);
+        CascadeNodeDto cnDto = new CascadeNodeDto();
+        DtoMarshaller.copyToDto(cn,cnDto);
+        return cnDto;
     }
 
     // bulk save new cascade nodes
@@ -170,7 +170,7 @@ private CascadeNodeDto createCascadeNode(CascadeNodeDto cascadeNodeDto){
     @ResponseBody
     public Map<String, Object> saveNewCascadeNodeBulk(@RequestBody
     CascadeNodeBulkPayload payLoad) {
-    	final List<CascadeNodeDto> cascadeNodeDtoList = payLoad.getCascade_nodes();
+        final List<CascadeNodeDto> cascadeNodeDtoList = payLoad.getCascade_nodes();
         final Map<String, Object> response = new HashMap<String, Object>();
         List<CascadeNodeDto> results = new ArrayList<CascadeNodeDto>();
         CascadeNodeDto dto = null;
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/rest/PlacemarkRestService.java b/GAE/src/org/waterforpeople/mapping/app/web/rest/PlacemarkRestService.java
index ce4fd1d285..f135d57f01 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/rest/PlacemarkRestService.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/rest/PlacemarkRestService.java
@@ -83,9 +83,9 @@ private boolean isAuthorizedUser() {
             return false;
         } else {
             Collection<? extends GrantedAuthority> auths = authentication.getAuthorities();
-            return auths.contains(AppRole.USER)
-                    || auths.contains(AppRole.ADMIN)
-                    || auths.contains(AppRole.SUPER_ADMIN);
+            return auths.contains(AppRole.ROLE_USER)
+                    || auths.contains(AppRole.ROLE_ADMIN)
+                    || auths.contains(AppRole.ROLE_SUPER_ADMIN);
         }
     }
 
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/rest/QuestionGroupRestService.java b/GAE/src/org/waterforpeople/mapping/app/web/rest/QuestionGroupRestService.java
index 0c43e0f642..dc210eacef 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/rest/QuestionGroupRestService.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/rest/QuestionGroupRestService.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2012-2018 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2012-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -352,10 +352,7 @@ private QuestionGroup copyGroup(QuestionGroupDto questionGroupDto) {
                         DataProcessorRequest.COPY_QUESTION_GROUP)
                 .param(DataProcessorRequest.QUESTION_GROUP_ID_PARAM,
                         String.valueOf(copyGroup.getKey().getId()))
-                .param(DataProcessorRequest.SOURCE_PARAM, questionGroupDto.getSourceId().toString())
-                .header("Host",
-                        BackendServiceFactory.getBackendService()
-                                .getBackendAddress("dataprocessor"));
+                .param(DataProcessorRequest.SOURCE_PARAM, questionGroupDto.getSourceId().toString());
 
         queue.add(options);
 
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/rest/UserRestService.java b/GAE/src/org/waterforpeople/mapping/app/web/rest/UserRestService.java
index ea7e7deb04..7d7e9c094b 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/rest/UserRestService.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/rest/UserRestService.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2012-2014,2017 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2012-2014,2017,2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -101,15 +101,15 @@ public Map<String, Object> listUsers(
     }
 
     private boolean isUserAdminRole(User user) {
-        return user.getPermissionList().equals(Integer.toString(AppRole.ADMIN.getLevel()))
+        return user.getPermissionList().equals(Integer.toString(AppRole.ROLE_ADMIN.getLevel()))
                 || user.getPermissionList()
-                        .equals(Integer.toString(AppRole.SUPER_ADMIN.getLevel()));
+                        .equals(Integer.toString(AppRole.ROLE_SUPER_ADMIN.getLevel()));
     }
 
     private boolean isSuperAdminRole(User user) {
         return user.isSuperAdmin()
                 || user.getPermissionList()
-                        .equals(Integer.toString(AppRole.SUPER_ADMIN.getLevel()));
+                        .equals(Integer.toString(AppRole.ROLE_SUPER_ADMIN.getLevel()));
     }
 
     // find a single user by the userId
@@ -182,8 +182,8 @@ public Map<String, Object> saveExistingUser(@RequestBody UserPayload payLoad) {
                     });
 
                     if (u.getPermissionList().equals(
-                            String.valueOf(AppRole.SUPER_ADMIN.getLevel()))) {
-                        u.setPermissionList(String.valueOf(AppRole.USER
+                            String.valueOf(AppRole.ROLE_SUPER_ADMIN.getLevel()))) {
+                        u.setPermissionList(String.valueOf(AppRole.ROLE_USER
                                 .getLevel()));
                     }
 
@@ -227,8 +227,8 @@ public Map<String, Object> saveNewUser(@RequestBody UserPayload payLoad) {
             });
 
             if (u.getPermissionList().equals(
-                    String.valueOf(AppRole.SUPER_ADMIN.getLevel()))) {
-                u.setPermissionList(String.valueOf(AppRole.USER.getLevel()));
+                    String.valueOf(AppRole.ROLE_SUPER_ADMIN.getLevel()))) {
+                u.setPermissionList(String.valueOf(AppRole.ROLE_USER.getLevel()));
             }
 
             u = userDao.save(u);
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/rest/dto/UserAuthorizationPayload.java b/GAE/src/org/waterforpeople/mapping/app/web/rest/dto/UserAuthorizationPayload.java
index 00b364121d..ed1144b5b9 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/rest/dto/UserAuthorizationPayload.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/rest/dto/UserAuthorizationPayload.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2015 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2014-2015,2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -19,7 +19,7 @@
 import java.util.Collection;
 
 import org.apache.commons.lang.StringUtils;
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.waterforpeople.mapping.app.web.rest.security.AppRole;
@@ -102,8 +102,8 @@ private boolean isAcceptablePath(String objectPath) {
                 Collection<? extends GrantedAuthority> authorities = SecurityContextHolder
                         .getContext().getAuthentication().getAuthorities();
 
-                return authorities.contains(AppRole.SUPER_ADMIN)
-                        || authorities.contains(AppRole.ADMIN);
+                return authorities.contains(AppRole.ROLE_SUPER_ADMIN)
+                        || authorities.contains(AppRole.ROLE_ADMIN);
 
             } else {
                 return true;
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/rest/dto/UserRolePayload.java b/GAE/src/org/waterforpeople/mapping/app/web/rest/dto/UserRolePayload.java
index fab7b2ed1c..2f9a7aaae9 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/rest/dto/UserRolePayload.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/rest/dto/UserRolePayload.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2014 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2014,2018 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -18,7 +18,7 @@
 
 import java.util.Set;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import com.gallatinsystems.framework.gwt.dto.client.BaseDto;
 import com.gallatinsystems.user.domain.Permission;
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/rest/security/ApiUserAuthentication.java b/GAE/src/org/waterforpeople/mapping/app/web/rest/security/ApiUserAuthentication.java
index 7aa9bd311e..c5d3fcc046 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/rest/security/ApiUserAuthentication.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/rest/security/ApiUserAuthentication.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2014,2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -53,7 +53,7 @@ public String getName() {
 
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
-        return EnumSet.of(AppRole.USER);
+        return EnumSet.of(AppRole.ROLE_USER);
     }
 
     @Override
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/rest/security/AppRole.java b/GAE/src/org/waterforpeople/mapping/app/web/rest/security/AppRole.java
index 76551925d9..76e25dcde9 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/rest/security/AppRole.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/rest/security/AppRole.java
@@ -1,3 +1,18 @@
+/*
+ *  Copyright (C) 2012-2014,2019 Stichting Akvo (Akvo Foundation)
+ *
+ *  This file is part of Akvo FLOW.
+ *
+ *  Akvo FLOW is free software: you can redistribute it and modify it under the terms of
+ *  the GNU Affero General Public License (AGPL) as published by the Free Software Foundation,
+ *  either version 3 of the License or any later version.
+ *
+ *  Akvo FLOW is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU Affero General Public License included below for more details.
+ *
+ *  The full license text can also be seen at <http://www.gnu.org/licenses/agpl.html>.
+ */
 
 package org.waterforpeople.mapping.app.web.rest.security;
 
@@ -7,10 +22,10 @@
  * @author Luke Taylor
  */
 public enum AppRole implements GrantedAuthority {
-    NEW_USER(-1),
-    SUPER_ADMIN(0),
-    ADMIN(10),
-    USER(20);
+    ROLE_NEW_USER(-1),
+    ROLE_SUPER_ADMIN(0),
+    ROLE_ADMIN(10),
+    ROLE_USER(20);
 
     private final int level;
 
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/rest/security/GaeAuthenticationFilter.java b/GAE/src/org/waterforpeople/mapping/app/web/rest/security/GaeAuthenticationFilter.java
index 2f2d62b0b7..726eb47cd2 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/rest/security/GaeAuthenticationFilter.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/rest/security/GaeAuthenticationFilter.java
@@ -68,7 +68,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
                     String logoutUrl = UserServiceFactory.getUserService().createLogoutURL("");
 
                     if (authentication.getAuthorities().contains(
-                            AppRole.NEW_USER)
+                            AppRole.ROLE_NEW_USER)
                             && !logoutUrl.startsWith(httpRequest
                                     .getRequestURI())
                             && !httpRequest.getRequestURI().startsWith(
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/rest/security/GoogleAccountsAuthenticationProvider.java b/GAE/src/org/waterforpeople/mapping/app/web/rest/security/GoogleAccountsAuthenticationProvider.java
index c61d1f7ef2..27f8f86479 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/rest/security/GoogleAccountsAuthenticationProvider.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/rest/security/GoogleAccountsAuthenticationProvider.java
@@ -70,8 +70,8 @@ private GaeUser findUser(String email) {
         final int authority = getAuthorityLevel(user);
         final Set<AppRole> roles = EnumSet.noneOf(AppRole.class);
 
-        if (authority == AppRole.NEW_USER.getLevel()) {
-            roles.add(AppRole.NEW_USER);
+        if (authority == AppRole.ROLE_NEW_USER.getLevel()) {
+            roles.add(AppRole.ROLE_NEW_USER);
         } else {
             for (AppRole r : AppRole.values()) {
                 if (authority <= r.getLevel()) {
@@ -86,15 +86,15 @@ private GaeUser findUser(String email) {
 
     private int getAuthorityLevel(com.gallatinsystems.user.domain.User user) {
         if (user.isSuperAdmin()) {
-            return AppRole.SUPER_ADMIN.getLevel();
+            return AppRole.ROLE_SUPER_ADMIN.getLevel();
         }
         try {
             final int level = Integer.parseInt(user.getPermissionList());
             return level;
         } catch (Exception e) {
-            log.log(Level.WARNING, "Error getting role level, setting USER role", e);
+            log.log(Level.WARNING, "Error getting role level, setting ROLE_USER role", e);
         }
-        return AppRole.USER.getLevel();
+        return AppRole.ROLE_USER.getLevel();
     }
 
     /**
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/rest/security/RequestUriVoter.java b/GAE/src/org/waterforpeople/mapping/app/web/rest/security/RequestUriVoter.java
index cb8ce98b17..bf96780aed 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/rest/security/RequestUriVoter.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/rest/security/RequestUriVoter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2015,2017 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2014-2015,2017-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -26,11 +26,11 @@
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
 import org.akvo.flow.domain.RootFolder;
 import org.akvo.flow.domain.SecuredObject;
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonToken;
 import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.ConfigAttribute;
@@ -132,7 +132,7 @@ private boolean abstainVote(Authentication authentication, FilterInvocation secu
         if (!URI_PATTERN.matcher(securedObject.getRequestUrl()).find()) {
             // request URL does not match the URI patterns we consider for voting
             return true;
-        } else if (authentication.getAuthorities().contains(AppRole.SUPER_ADMIN)) {
+        } else if (authentication.getAuthorities().contains(AppRole.ROLE_SUPER_ADMIN)) {
             // requester is a super admin user no need to control access or
             return true;
         } else if ("GET".equals(securedObject.getHttpRequest().getMethod())
@@ -199,7 +199,7 @@ private Long parsePayload(HttpServletRequest httpRequest) {
 
         try {
             JsonFactory f = new JsonFactory();
-            JsonParser parser = f.createJsonParser(httpRequest.getInputStream());
+            JsonParser parser = f.createParser(httpRequest.getInputStream());
 
             boolean isSurvey = false;
             boolean isForm = false;
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/rest/security/user/GaeUser.java b/GAE/src/org/waterforpeople/mapping/app/web/rest/security/user/GaeUser.java
index a9aaf0b0aa..5c5d4b4aa3 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/rest/security/user/GaeUser.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/rest/security/user/GaeUser.java
@@ -22,10 +22,10 @@ public class GaeUser implements Serializable {
     private Long userId;
 
     /**
-     * Pre-registration constructor. Assigns the user the "NEW_USER" role only.
+     * Pre-registration constructor. Assigns the user the "ROLE_NEW_USER" role only.
      */
     public GaeUser(String userName, String email) {
-        this.authorities = EnumSet.of(AppRole.NEW_USER);
+        this.authorities = EnumSet.of(AppRole.ROLE_NEW_USER);
         this.userName = userName;
         this.email = email;
         this.enabled = true;
diff --git a/GAE/src/org/waterforpeople/mapping/dao/SurveyInstanceDAO.java b/GAE/src/org/waterforpeople/mapping/dao/SurveyInstanceDAO.java
index a6a551a634..a43504b392 100644
--- a/GAE/src/org/waterforpeople/mapping/dao/SurveyInstanceDAO.java
+++ b/GAE/src/org/waterforpeople/mapping/dao/SurveyInstanceDAO.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2015, 2017, 2018 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2015, 2017-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -28,10 +28,11 @@
 import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
 
+import org.akvo.flow.domain.DataUtils;
 import org.apache.commons.lang.StringUtils;
 import org.waterforpeople.mapping.analytics.dao.SurveyQuestionSummaryDao;
 import org.waterforpeople.mapping.analytics.domain.SurveyQuestionSummary;
-import org.waterforpeople.mapping.app.web.dto.DataProcessorRequest;
+import org.waterforpeople.mapping.app.web.DataProcessorRestServlet;
 import org.waterforpeople.mapping.app.web.dto.ImageCheckRequest;
 import org.waterforpeople.mapping.domain.QuestionAnswerStore;
 import org.waterforpeople.mapping.domain.SurveyInstance;
@@ -90,7 +91,7 @@ public SurveyInstance save(SurveyInstance si, DeviceFiles deviceFile) {
         SurveyedLocale sl = saveSurveyedLocale(si);
         si.setSurveyedLocaleId(sl.getKey().getId());
         if (si.getSurveyedLocaleDisplayName() == null && sl != null) {
-            //in case app did not send SL name, we may get it from an old SL 
+            //in case app did not send SL name, we may get it from an old SL
             si.setSurveyedLocaleDisplayName(sl.getDisplayName());
         }
         si.setDeviceFile(deviceFile);
@@ -158,7 +159,7 @@ public SurveyInstance save(SurveyInstance si, DeviceFiles deviceFile) {
         }
 
         deviceFile.setSurveyInstanceId(si.getKey().getId());
-        si.updateSummaryCounts(true);
+        DataProcessorRestServlet.queueSynchronizedSummaryUpdate(si, true);
 
         return si;
     }
@@ -344,8 +345,7 @@ public List<SurveyInstance> listByDateRangeAndSubmitter(Date beginDate, Date end
      */
     public Iterable<Entity> listRawEntity(Boolean returnKeysOnly,
             Date beginDate, Date endDate, Integer limit, Long surveyId) {
-        DatastoreService datastore = DatastoreServiceFactory
-                .getDatastoreService();
+        DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
         // The Query interface assembles a query
         com.google.appengine.api.datastore.Query q = new com.google.appengine.api.datastore.Query(
                 "SurveyInstance");
@@ -483,6 +483,67 @@ public List<QuestionAnswerStore> listQuestionAnswerStoreForQuestion(
         return (List<QuestionAnswerStore>) q.execute(questionId);
     }
 
+    /**
+     * Update counts of SurveyQuestionSummary entities related to responses from this survey
+     * instance.
+     * Execute on the surveyResponseCount task queue to prevent concurrent access errors!
+     */
+    public void updateSummaryCounts(long siId, boolean increment) {
+        // retrieve all summary objects
+        SurveyQuestionSummaryDao summaryDao = new SurveyQuestionSummaryDao();
+        QuestionAnswerStoreDao qasDao = new QuestionAnswerStoreDao();
+        QuestionDao qDao = new QuestionDao();
+
+        List<QuestionAnswerStore> answerList = qasDao.listBySurveyInstance(siId);
+        if (answerList == null || answerList.isEmpty()) {
+            return;
+        }
+        List<SurveyQuestionSummary> saveList = new ArrayList<SurveyQuestionSummary>();
+        List<SurveyQuestionSummary> deleteList = new ArrayList<SurveyQuestionSummary>();
+
+        for (QuestionAnswerStore response : answerList) {
+            final Long questionId = Long.parseLong(response.getQuestionID());
+            Question question = qDao.getByKey(questionId);
+            if (question == null || !question.canBeCharted()) {
+                continue;
+            }
+
+            final String questionIdStr = response.getQuestionID();
+            //JSON or |-separated content; take it apart
+            final String[] questionResponse = DataUtils.optionResponsesTextArray(response
+                    .getValue());
+
+            for (int i = 0; i < questionResponse.length; i++) {
+                List<SurveyQuestionSummary> questionSummaryList = summaryDao
+                        .listByResponse(questionIdStr, questionResponse[i]); //could be longer than MAX_DS_STRING_LENGTH!
+                SurveyQuestionSummary questionSummary = null;
+                if (questionSummaryList.isEmpty()) {
+                    questionSummary = new SurveyQuestionSummary();
+                    questionSummary.setQuestionId(response.getQuestionID());
+                    questionSummary.setResponse(questionResponse[i]); //could be longer than MAX_DS_STRING_LENGTH!
+                    questionSummary.setCount(0L);
+                    summaryDao.save(questionSummary);
+                } else {
+                    questionSummary = questionSummaryList.get(0);
+                }
+
+                // update and save or delete
+                long count = questionSummary.getCount() == null ? 0 : questionSummary.getCount();
+                count = increment ? ++count : --count;
+                questionSummary.setCount(count);
+
+                if (count > 0) {
+                    saveList.add(questionSummary);
+                } else {
+                    deleteList.add(questionSummary);
+                }
+            }
+        }
+
+        summaryDao.save(saveList);
+        summaryDao.delete(deleteList);
+    }
+
     /**
      * Deletes a surveyInstance and all its related objects
      *
@@ -500,21 +561,20 @@ public void deleteSurveyInstance(SurveyInstance surveyInstance) {
         if (qasList != null && !qasList.isEmpty()) {
             for (QuestionAnswerStore qasItem : qasList) {
                 // question summaries
-                Question question = qDao.getByKey(Long.parseLong(qasItem.getQuestionID()));
+                Question question = qDao.getByKey(Long.parseLong(qasItem.getQuestionID())); //QAS question IDs are stored as String...
                 if (question != null && question.canBeCharted()) {
-                    Queue questionSummaryQueue = QueueFactory.getQueue("surveyResponseCount");
-                    List<SurveyQuestionSummary> summaryList = summDao.listByResponse(
-                            qasItem.getQuestionID(), qasItem.getValue());
-                    if (summaryList != null && !summaryList.isEmpty()) {
-                        TaskOptions to = TaskOptions.Builder
-                                .withUrl("/app_worker/dataprocessor")
-                                .param(DataProcessorRequest.ACTION_PARAM,
-                                        DataProcessorRequest.SURVEY_RESPONSE_COUNT)
-                                .param(DataProcessorRequest.COUNTER_ID_PARAM,
-                                        summaryList.get(0).getKey().getId() + "")
-                                .param(DataProcessorRequest.DELTA_PARAM, "-1");
-                        questionSummaryQueue.add(to);
-                        continue;
+                    //JSON or |-separated, possibly multiple choices; take it apart
+                    final String[] responses = DataUtils.optionResponsesTextArray(qasItem.getValue());
+                    for (int i = 0; i < responses.length; i++) {
+                        List<SurveyQuestionSummary> summaryList = summDao.listByResponse(
+                                qasItem.getQuestionID(),
+                                responses[i]); //could be longer than MAX_DS_STRING_LENGTH!
+
+                        if (summaryList != null && !summaryList.isEmpty()) {
+                            String key = Long.toString(summaryList.get(0).getKey().getId());
+                            DataProcessorRestServlet.queueAdjustSurveyResponseCount(key, false);
+                            continue;
+                        }
                     }
                 }
             }
@@ -579,8 +639,7 @@ public List<SurveyInstance> listSurveyInstanceBySurvey(Long surveyId,
         q.setOrdering("createdDateTime asc");
         q.declareParameters("Long surveyIdParam");
         prepareCursor(cursorString, count, q);
-        List<SurveyInstance> siList = (List<SurveyInstance>) q
-                .execute(surveyId);
+        List<SurveyInstance> siList = (List<SurveyInstance>) q.execute(surveyId);
 
         return siList;
     }
@@ -591,8 +650,7 @@ public List<SurveyInstance> listSurveyInstanceBySurveyId(Long surveyId,
     }
 
     public Iterable<Entity> listSurveyInstanceKeysBySurveyId(Long surveyId) {
-        DatastoreService datastore = DatastoreServiceFactory
-                .getDatastoreService();
+        DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
         com.google.appengine.api.datastore.Query q = new com.google.appengine.api.datastore.Query(
                 "SurveyInstance");
         q.setKeysOnly().setFilter(new FilterPredicate("surveyId", FilterOperator.EQUAL, surveyId));
diff --git a/GAE/src/org/waterforpeople/mapping/dataexport/GraphicalSurveySummaryExporter.java b/GAE/src/org/waterforpeople/mapping/dataexport/GraphicalSurveySummaryExporter.java
index 2577a60378..f85652bd06 100644
--- a/GAE/src/org/waterforpeople/mapping/dataexport/GraphicalSurveySummaryExporter.java
+++ b/GAE/src/org/waterforpeople/mapping/dataexport/GraphicalSurveySummaryExporter.java
@@ -40,7 +40,9 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.akvo.flow.domain.DataUtils;
+import org.akvo.flow.util.FlowJsonObjectReader;
 import org.akvo.flow.util.JFreechartChartUtil;
 import org.apache.log4j.ConsoleAppender;
 import org.apache.log4j.Level;
@@ -59,8 +61,6 @@
 import org.apache.poi.ss.util.WorkbookUtil;
 import org.apache.poi.xssf.streaming.SXSSFSheet;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
 import org.waterforpeople.mapping.app.gwt.client.survey.OptionContainerDto;
 import org.waterforpeople.mapping.app.gwt.client.survey.QuestionDto;
 import org.waterforpeople.mapping.app.gwt.client.survey.QuestionDto.QuestionType;
@@ -153,7 +153,6 @@ public class GraphicalSurveySummaryExporter extends SurveySummaryExporter {
     private Map<Long, QuestionDto> questionsById;
     private SurveyGroupDto surveyGroupDto;
     private boolean lastCollection = false;
-    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
     private CaddisflyResourceDao caddisflyResourceDao = new CaddisflyResourceDao();
     private String caddisflyTestsFileUrl;
     private String selectionFrom = null;
@@ -689,6 +688,10 @@ private synchronized int writeInstanceData(
             if (rollupOrder != null && rollupOrder.size() > 0) {
                 rollups = formRollupStrings(responseMap);
             }
+            FlowJsonObjectReader jsonReader = new FlowJsonObjectReader();
+            TypeReference<List<Map<String, String>>> typeReference = new TypeReference<List<Map<String, String>>>() {};
+
+
             for (Entry<String, String> entry : responseMap.entrySet()) {
                 //OPTION, NUMBER and CASCADE summarizable now.
                 if (!unsummarizable.contains(entry.getKey())) {
@@ -700,10 +703,7 @@ private synchronized int writeInstanceData(
                     String[] vals;
                     if (entry.getValue().startsWith("[")) { //JSON
                         try {
-                            List<Map<String, String>> optionNodes = OBJECT_MAPPER.readValue(
-                                    entry.getValue(),
-                                    new TypeReference<List<Map<String, String>>>() {}
-                                    );
+                            List<Map<String, String>> optionNodes = jsonReader.readObject(entry.getValue(), typeReference);
                             List<String> valsList = new ArrayList<>();
                             for (Map<String, String> optionNode : optionNodes) {
                                 if (optionNode.containsKey("text")) {
@@ -974,10 +974,11 @@ private Map<Integer, Map<String, Object>> mapCaddisflyResultsById(
         List<Map<String, String>> cascadeNodes = new ArrayList<>();
 
         if (value.startsWith("[")) {
+            FlowJsonObjectReader jsonReader = new FlowJsonObjectReader();
+            TypeReference<List<Map<String, String>>> typeReference = new TypeReference<List<Map<String, String>>>() {};
+
             try {
-                cascadeNodes = OBJECT_MAPPER.readValue(value,
-                        new TypeReference<List<Map<String, String>>>() {
-                        });
+                cascadeNodes = jsonReader.readObject(value, typeReference);
             } catch (IOException e) {
                 log.warn("Unable to parse CASCADE response - " + value, e);
             }
@@ -988,9 +989,9 @@ private Map<Integer, Map<String, Object>> mapCaddisflyResultsById(
                 cascadeNodes.add(m);
             }
         }
-        
+
         //We used to always set code=name if not otherwise set
-        //and users did not like getting a:a, b:b, etc. everywhere 
+        //and users did not like getting a:a, b:b, etc. everywhere
         boolean allCodesEqualsName = true;
         for (Map<String, String> cascadeNode : cascadeNodes) {
             String code = cascadeNode.get("code");
@@ -1078,11 +1079,12 @@ private Map<Integer, Map<String, Object>> mapCaddisflyResultsById(
     private List<Map<String, String>> getNodes(String value) {
         boolean isNewFormat = value.startsWith("[");
         List<Map<String, String>> optionNodes = new ArrayList<>();
+        FlowJsonObjectReader jsonReader = new FlowJsonObjectReader();
+        TypeReference<List<Map<String, String>>> typeReference = new TypeReference<List<Map<String, String>>>() {};
+
         if (isNewFormat) {
             try {
-                optionNodes = OBJECT_MAPPER.readValue(value,
-                        new TypeReference<List<Map<String, String>>>() {
-                        });
+                optionNodes = jsonReader.readObject(value, typeReference);
             } catch (IOException e) {
                 log.warn("Could not parse option response: " + value, e);
             }
@@ -1148,7 +1150,7 @@ private List<String> optionCellValues(Long questionId, String value,
             numOptions = options.size();
         }
         boolean[] optionFound = new boolean[numOptions]; //Zero-length array ok
-        
+
         // if needed, scan options
         if (allowOther || (splitIntoColumns && allowMultiple)) { //Split options into own columns, if multiselect
             boolean found;
@@ -1671,12 +1673,11 @@ private void writeStatsAndGraphsSheet(
                         } else {
                             // Handle the json option question response type
                             if (labelText.startsWith("[")) {
+                                FlowJsonObjectReader jsonReader = new FlowJsonObjectReader();
+                                TypeReference<List<Map<String, String>>> typeReference = new TypeReference<List<Map<String, String>>>() {};
+
                                 try {
-                                    List<Map<String, String>> optionNodes = OBJECT_MAPPER
-                                            .readValue(
-                                                    labelText,
-                                                    new TypeReference<List<Map<String, String>>>() {
-                                                    });
+                                    List<Map<String, String>> optionNodes = jsonReader.readObject(labelText, typeReference);
                                     StringBuilder labelTextBuilder = new StringBuilder();
 
                                     for (Map<String, String> optionNode : optionNodes) {
diff --git a/GAE/src/org/waterforpeople/mapping/dataexport/RawDataSpreadsheetImporter.java b/GAE/src/org/waterforpeople/mapping/dataexport/RawDataSpreadsheetImporter.java
index 90916d3e6d..0b70833a6b 100644
--- a/GAE/src/org/waterforpeople/mapping/dataexport/RawDataSpreadsheetImporter.java
+++ b/GAE/src/org/waterforpeople/mapping/dataexport/RawDataSpreadsheetImporter.java
@@ -37,6 +37,7 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import org.akvo.flow.util.FlowJsonObjectWriter;
 import org.apache.log4j.BasicConfigurator;
 import org.apache.log4j.Logger;
 import org.apache.poi.ss.usermodel.Cell;
@@ -45,7 +46,6 @@
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.apache.poi.ss.util.CellReference;
-import org.codehaus.jackson.map.ObjectMapper;
 import org.waterforpeople.mapping.app.gwt.client.survey.QuestionDto;
 import org.waterforpeople.mapping.app.gwt.client.survey.QuestionDto.QuestionType;
 import org.waterforpeople.mapping.app.gwt.client.survey.QuestionOptionDto;
@@ -67,8 +67,7 @@ public class RawDataSpreadsheetImporter implements DataImporter {
     private ThreadPoolExecutor threadPool;
     private BlockingQueue<Runnable> jobQueue;
     private List<String> errorIds;
-    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-
+    private static final FlowJsonObjectWriter JSON_OBJECT_WRITER = new FlowJsonObjectWriter();
     private static final int LEGACY_MONITORING_FORMAT = 6;
     private static final int MONITORING_FORMAT_WITH_DEVICE_ID_COLUMN = 7;
     private static final int MONITORING_FORMAT_WITH_REPEAT_COLUMN = 8;
@@ -644,7 +643,7 @@ private void getIterationResponse(Row iterationRow,
                         cascadeList.add(cascadeMap);
                     }
                     try {
-                        val = OBJECT_MAPPER.writeValueAsString(cascadeList);
+                        val = JSON_OBJECT_WRITER.writeAsString(cascadeList);
                     } catch (IOException e) {
                         log.warn("Could not parse cascade string: " + cascadeString);
                     }
@@ -696,7 +695,7 @@ private void getIterationResponse(Row iterationRow,
 
                     try {
                         if (!optionList.isEmpty()) {
-                            val = OBJECT_MAPPER.writeValueAsString(optionList);
+                            val = JSON_OBJECT_WRITER.writeAsString(optionList);
                         }
                     } catch (IOException e) {
                         log.warn("Could not parse option string: " + optionString, e);
diff --git a/GAE/src/org/waterforpeople/mapping/dataexport/SurveySummaryExporter.java b/GAE/src/org/waterforpeople/mapping/dataexport/SurveySummaryExporter.java
index 5ce8d0fe85..711ec406ca 100644
--- a/GAE/src/org/waterforpeople/mapping/dataexport/SurveySummaryExporter.java
+++ b/GAE/src/org/waterforpeople/mapping/dataexport/SurveySummaryExporter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2017 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -29,11 +29,10 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.akvo.flow.domain.DataUtils;
+import org.akvo.flow.util.FlowJsonObjectReader;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.waterforpeople.mapping.app.gwt.client.survey.OptionContainerDto;
@@ -349,13 +348,9 @@ protected List<QuestionGroupDto> parseQuestionGroups(String response)
      * @throws Exception
      */
     protected List<QuestionDto> parseQuestions(String response) throws Exception {
-        final ObjectMapper JSON_RESPONSE_PARSER = new ObjectMapper();
-
-        final JsonNode questionListNode =
-                JSON_RESPONSE_PARSER.readTree(response).get("dtoList");
-        final List<QuestionDto> qList = JSON_RESPONSE_PARSER.readValue(
-                questionListNode, new TypeReference<List<QuestionDto>>() {
-                });
+        final FlowJsonObjectReader jsonReader = new FlowJsonObjectReader();
+        final TypeReference<QuestionDto> listItemTypeReference = new TypeReference<QuestionDto>(){};
+        final List<QuestionDto> qList = jsonReader.readDtoListObject(response, listItemTypeReference);
         return qList;
     }
     
diff --git a/GAE/src/org/waterforpeople/mapping/dataexport/service/BulkDataServiceClient.java b/GAE/src/org/waterforpeople/mapping/dataexport/service/BulkDataServiceClient.java
index aa1de52f82..5730247839 100644
--- a/GAE/src/org/waterforpeople/mapping/dataexport/service/BulkDataServiceClient.java
+++ b/GAE/src/org/waterforpeople/mapping/dataexport/service/BulkDataServiceClient.java
@@ -44,13 +44,10 @@
 import com.gallatinsystems.framework.rest.RestRequest;
 import com.gallatinsystems.survey.domain.SurveyGroup.PrivacyLevel;
 import com.gallatinsystems.survey.domain.SurveyGroup.ProjectType;
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.akvo.flow.util.FlowJsonObjectReader;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -65,7 +62,6 @@
 import org.waterforpeople.mapping.app.gwt.client.survey.TranslationDto;
 import org.waterforpeople.mapping.app.gwt.client.surveyinstance.SurveyInstanceDto;
 import org.waterforpeople.mapping.app.web.dto.DataBackoutRequest;
-import org.waterforpeople.mapping.app.web.dto.DeviceFileRestRequest;
 import org.waterforpeople.mapping.app.web.dto.InstanceDataDto;
 import org.waterforpeople.mapping.app.web.dto.SurveyRestRequest;
 
@@ -85,7 +81,6 @@ public class BulkDataServiceClient {
     private static final String SURVEY_SERVLET_PATH = "/surveyrestapi";
     private static final String INSTANCE_DATA_SERVLET_PATH = "/instancedata";
     private static final String DEVICE_FILES_SERVLET_PATH = "/devicefilesrestapi?action=";
-    private static final ObjectMapper JSON_RESPONSE_PARSER = new ObjectMapper();
 
     /**
      * lists all responses from the server for a surveyInstance submission as a map of values keyed
@@ -352,12 +347,12 @@ public static InstanceDataDto fetchInstanceData(Long surveyInstanceId, String se
     }
 
     private static InstanceDataDto parseInstanceData(String instanceDataResponse) {
+        FlowJsonObjectReader jsonReader = new FlowJsonObjectReader();
+        TypeReference<InstanceDataDto> typeReference = new TypeReference<InstanceDataDto>() {};
+
         try {
-            InstanceDataDto instanceData = JSON_RESPONSE_PARSER.readValue(instanceDataResponse,
-                    InstanceDataDto.class);
+            InstanceDataDto instanceData = jsonReader.readObject(instanceDataResponse, typeReference);
             return instanceData;
-        } catch (JsonParseException | JsonMappingException e) {
-            log.warn("Failed to parse the InstanceDataDto string: " + e);
         } catch (IOException e) {
             log.error("Error while parsing: ", e);
         }
@@ -403,11 +398,10 @@ public static SurveyGroupDto fetchSurveyGroup(String surveyId, String serverBase
 
             log.debug("response: " + surveyGroupResponse);
 
-            final JsonNode surveyGroupListNode = JSON_RESPONSE_PARSER.readTree(surveyGroupResponse)
-                    .get("dtoList");
-            final List<SurveyGroupDto> surveyGroupList = JSON_RESPONSE_PARSER.readValue(
-                    surveyGroupListNode, new TypeReference<List<SurveyGroupDto>>() {
-                    });
+            final FlowJsonObjectReader jsonDeserialiser = new FlowJsonObjectReader();
+            final TypeReference<SurveyGroupDto> listItemTypeReference = new TypeReference<SurveyGroupDto>(){};
+            final List<SurveyGroupDto> surveyGroupList = jsonDeserialiser.readDtoListObject(surveyGroupResponse, listItemTypeReference);
+
             if (surveyGroupList != null && !surveyGroupList.isEmpty()) {
                 surveyGroupDto = surveyGroupList.get(0);
             }
diff --git a/GAE/src/org/waterforpeople/mapping/domain/CaddisflyResource.java b/GAE/src/org/waterforpeople/mapping/domain/CaddisflyResource.java
index 4fdfc6d9f2..0a246bf4d2 100644
--- a/GAE/src/org/waterforpeople/mapping/domain/CaddisflyResource.java
+++ b/GAE/src/org/waterforpeople/mapping/domain/CaddisflyResource.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 Stichting Akvo (Akvo Foundation)
+/*  Copyright (C) 2016-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -15,7 +15,7 @@
 
 package org.waterforpeople.mapping.domain;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/GAE/src/org/waterforpeople/mapping/domain/CaddisflyResult.java b/GAE/src/org/waterforpeople/mapping/domain/CaddisflyResult.java
index aa01327e82..32fae9f97e 100644
--- a/GAE/src/org/waterforpeople/mapping/domain/CaddisflyResult.java
+++ b/GAE/src/org/waterforpeople/mapping/domain/CaddisflyResult.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 Stichting Akvo (Akvo Foundation)
+/*  Copyright (C) 2016-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -15,7 +15,7 @@
 
 package org.waterforpeople.mapping.domain;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import java.io.Serializable;
 
diff --git a/GAE/src/org/waterforpeople/mapping/domain/SurveyInstance.java b/GAE/src/org/waterforpeople/mapping/domain/SurveyInstance.java
index a27ff94e49..1b1d7c6f95 100644
--- a/GAE/src/org/waterforpeople/mapping/domain/SurveyInstance.java
+++ b/GAE/src/org/waterforpeople/mapping/domain/SurveyInstance.java
@@ -19,21 +19,14 @@
 import com.gallatinsystems.common.Constants;
 import com.gallatinsystems.device.domain.DeviceFiles;
 import com.gallatinsystems.framework.domain.BaseDomain;
-import com.gallatinsystems.survey.dao.QuestionDao;
 import com.gallatinsystems.survey.dao.SurveyDAO;
-import com.gallatinsystems.survey.domain.Question;
-import org.akvo.flow.domain.DataUtils;
 import org.akvo.flow.domain.SecuredObject;
 import org.apache.commons.lang.StringUtils;
-import org.waterforpeople.mapping.analytics.dao.SurveyQuestionSummaryDao;
-import org.waterforpeople.mapping.analytics.domain.SurveyQuestionSummary;
-
 import javax.jdo.annotations.IdentityType;
 import javax.jdo.annotations.NotPersistent;
 import javax.jdo.annotations.PersistenceCapable;
 import javax.jdo.annotations.Persistent;
 import java.lang.reflect.Field;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -276,59 +269,6 @@ public static Map<String, Object> retrieveGeoLocation(
         return geoLocationMap;
     }
 
-    /**
-     * Update counts of SurveyQuestionSummary entities related to responses from this survey
-     * instance.
-     */
-    public void updateSummaryCounts(boolean increment) {
-
-        // retrieve all summary objects
-        SurveyQuestionSummaryDao summaryDao = new SurveyQuestionSummaryDao();
-        QuestionDao qDao = new QuestionDao();
-
-        List<SurveyQuestionSummary> saveList = new ArrayList<SurveyQuestionSummary>();
-        List<SurveyQuestionSummary> deleteList = new ArrayList<SurveyQuestionSummary>();
-
-        for (QuestionAnswerStore response : questionAnswersStore) {
-            final Long questionId = Long.parseLong(response.getQuestionID());
-            Question question = qDao.getByKey(questionId);
-            if (question == null || !question.canBeCharted()) {
-                continue;
-            }
-
-            final String questionIdStr = response.getQuestionID();
-            final String[] questionResponse = DataUtils.optionResponsesTextArray(response
-                    .getValue());
-
-            for (int i = 0; i < questionResponse.length; i++) {
-                List<SurveyQuestionSummary> questionSummaryList = summaryDao
-                        .listByResponse(questionIdStr, questionResponse[i]);
-                SurveyQuestionSummary questionSummary = null;
-                if (questionSummaryList.isEmpty()) {
-                    questionSummary = new SurveyQuestionSummary();
-                    questionSummary.setQuestionId(response.getQuestionID());
-                    questionSummary.setResponse(questionResponse[i]);
-                    questionSummary.setCount(0L);
-                } else {
-                    questionSummary = questionSummaryList.get(0);
-                }
-
-                // update and save or delete
-                long count = questionSummary.getCount() == null ? 0 : questionSummary.getCount();
-                count = increment ? ++count : --count;
-                questionSummary.setCount(count);
-
-                if (count > 0) {
-                    saveList.add(questionSummary);
-                } else {
-                    deleteList.add(questionSummary);
-                }
-            }
-        }
-
-        summaryDao.save(saveList);
-        summaryDao.delete(deleteList);
-    }
 
     @Override
     public SecuredObject getParentObject() {
diff --git a/GAE/src/org/waterforpeople/mapping/serialization/SurveyInstanceHandler.java b/GAE/src/org/waterforpeople/mapping/serialization/SurveyInstanceHandler.java
index fd1af5589d..bafdc8ac06 100644
--- a/GAE/src/org/waterforpeople/mapping/serialization/SurveyInstanceHandler.java
+++ b/GAE/src/org/waterforpeople/mapping/serialization/SurveyInstanceHandler.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015-2017 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2015-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -23,8 +23,9 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.akvo.flow.util.FlowJsonObjectReader;
 import org.apache.commons.lang.StringUtils;
-import org.codehaus.jackson.map.ObjectMapper;
 import org.waterforpeople.mapping.domain.QuestionAnswerStore;
 import org.waterforpeople.mapping.domain.SurveyInstance;
 import org.waterforpeople.mapping.domain.response.FormInstance;
@@ -52,9 +53,12 @@ public class SurveyInstanceHandler {
 
     public static SurveyInstance fromJSON(String data) {
         FormInstance formInstance = null;
-        ObjectMapper mapper = new ObjectMapper();
+        FlowJsonObjectReader jsonReader = new FlowJsonObjectReader();
+        TypeReference<FormInstance> typeReference = new TypeReference<FormInstance>() {};
+
+
         try {
-            formInstance = mapper.readValue(data, FormInstance.class);
+            formInstance = jsonReader.readObject(data, typeReference);
         } catch (IOException e) {
             log.log(Level.SEVERE, "Error mapping JSON data: " + e.getMessage(), e);
             return null;
diff --git a/GAE/src/org/waterforpeople/mapping/serialization/response/MediaResponse.java b/GAE/src/org/waterforpeople/mapping/serialization/response/MediaResponse.java
index 568e93af1e..4a95410976 100644
--- a/GAE/src/org/waterforpeople/mapping/serialization/response/MediaResponse.java
+++ b/GAE/src/org/waterforpeople/mapping/serialization/response/MediaResponse.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2016 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2016,2018-2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -19,12 +19,15 @@
 import java.io.IOException;
 import java.util.logging.Logger;
 
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.akvo.flow.util.FlowJsonObjectReader;
+import org.akvo.flow.util.FlowJsonObjectWriter;
 import org.waterforpeople.mapping.domain.response.value.Media;
 
 public class MediaResponse {
     private static final Logger log = Logger.getLogger(MediaResponse.class.getName());
-    private static final ObjectMapper JSON_OBJECT_MAPPER = new ObjectMapper();
+    private static FlowJsonObjectReader jsonObjectReader = new FlowJsonObjectReader();
+    private static FlowJsonObjectWriter jsonObjectWriter = new FlowJsonObjectWriter();
 
     public static final int VERSION_STRING = 0;
     public static final int VERSION_GEOTAGGING = 1;
@@ -36,8 +39,9 @@ public class MediaResponse {
     public static String format(String value, int version) {
         Media media;
         int savedVersion;
+
         try {
-            media = JSON_OBJECT_MAPPER.readValue(value, Media.class);
+            media = jsonObjectReader.readObject(value, new TypeReference<Media>() {});
             savedVersion = VERSION_GEOTAGGING;
         } catch (IOException e) {
             // Value is not JSON-formatted
@@ -52,7 +56,7 @@ public static String format(String value, int version) {
 
         if (version == VERSION_GEOTAGGING) {
             try {
-                return JSON_OBJECT_MAPPER.writeValueAsString(media);
+                return jsonObjectWriter.writeAsString(media);
             } catch (IOException e) {
                 log.warning(e.getMessage());
                 return "";
@@ -65,7 +69,7 @@ public static String format(String value, int version) {
 
     public static Media parse(String value) {
         try {
-            return JSON_OBJECT_MAPPER.readValue(value, Media.class);
+            return jsonObjectReader.readObject(value, new TypeReference<Media>() {});
         } catch (IOException e) {
         }
 
diff --git a/GAE/src/test/java/org/akvo/flow/util/FlowJsonObjectReaderTests.java b/GAE/src/test/java/org/akvo/flow/util/FlowJsonObjectReaderTests.java
new file mode 100644
index 0000000000..60c06e889a
--- /dev/null
+++ b/GAE/src/test/java/org/akvo/flow/util/FlowJsonObjectReaderTests.java
@@ -0,0 +1,180 @@
+/*
+ *  Copyright (C) 2019 Stichting Akvo (Akvo Foundation)
+ *
+ *  This file is part of Akvo FLOW.
+ *
+ *  Akvo FLOW is free software: you can redistribute it and modify it under the terms of
+ *  the GNU Affero General Public License (AGPL) as published by the Free Software Foundation,
+ *  either version 3 of the License or any later version.
+ *
+ *  Akvo FLOW is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU Affero General Public License included below for more details.
+ *
+ *  The full license text can also be seen at <http://www.gnu.org/licenses/agpl.html>.
+ */
+
+package test.java.org.akvo.flow.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.akvo.flow.util.FlowJsonObjectReader;
+import org.junit.jupiter.api.Test;
+import org.waterforpeople.mapping.app.gwt.client.survey.QuestionDto;
+import org.waterforpeople.mapping.app.gwt.client.survey.SurveyGroupDto;
+import org.waterforpeople.mapping.domain.CaddisflyResource;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+class FlowJsonObjectReaderTests {
+
+    private String QUESTION_DTO_JSON_STRING = "{ \"type\": \"FREE_TEXT\",\n" +
+                                                "\"text\": \"How many toilets are present?\",\n" +
+                                                "\"dependentFlag\": false,\n" +
+                                                "\"questionGroupId\": 12345678,\n" +
+                                                "\"surveyId\": 910111213,\n" +
+                                                "\"order\": 0 }";
+
+    private String COMPLEX_JSON_OBJECT = "{\n" +
+                                        "  \"tests\": [\n" +
+                                        "    {\n" +
+                                        "      \"name\": \"Soil - Electrical Conductivity\",\n" +
+                                        "      \"subtype\": \"sensor\",\n" +
+                                        "      \"uuid\": \"80697cd1-acc9-4a15-8358-f32b4257dfaf\",\n" +
+                                        "      \"deviceId\": \"SoilEC\",\n" +
+                                        "      \"brand\": \"Caddisfly\",\n" +
+                                        "      \"image\": \"Caddisfly-Soil-EC\",\n" +
+                                        "      \"imageScale\": \"centerCrop\",\n" +
+                                        "      \"ranges\": \"50,12800\",\n" +
+                                        "      \"responseFormat\": \"$2,$1\",\n" +
+                                        "      \"instructions\": [],\n" +
+                                        "      \"results\": [\n" +
+                                        "        {\n" +
+                                        "          \"id\": 1,\n" +
+                                        "          \"name\": \"Soil Electrical Conductivity\",\n" +
+                                        "          \"unit\": \"μS/cm\"\n" +
+                                        "        },\n" +
+                                        "        {\n" +
+                                        "          \"id\": 2,\n" +
+                                        "          \"name\": \"Temperature\",\n" +
+                                        "          \"unit\": \"°Celsius\"\n" +
+                                        "        }\n" +
+                                        "      ]\n" +
+                                        "    },\n" +
+                                        "    {\n" +
+                                        "      \"name\": \"Soil - Moisture\",\n" +
+                                        "      \"subtype\": \"sensor\",\n" +
+                                        "      \"uuid\": \"0b4a0aaa-f556-4c11-a539-c4626582cca6\",\n" +
+                                        "      \"deviceId\": \"Soil Moisture\",\n" +
+                                        "      \"brand\": \"Caddisfly\",\n" +
+                                        "      \"image\": \"Caddisfly-Soil-Moisture\",\n" +
+                                        "      \"imageScale\": \"centerCrop\",\n" +
+                                        "      \"ranges\": \"0,100\",\n" +
+                                        "      \"responseFormat\": \"$1\",\n" +
+                                        "      \"instructions\": [],\n" +
+                                        "      \"results\": [\n" +
+                                        "        {\n" +
+                                        "          \"id\": 1,\n" +
+                                        "          \"name\": \"Soil Moisture\",\n" +
+                                        "          \"unit\": \"% VWC\"\n" +
+                                        "        }\n" +
+                                        "      ]\n" +
+                                        "    }\n" +
+                                        "]}";
+
+    private String DTO_LIST_JSON_OBJECT = "{\n" +
+                                        "  \"code\": null, \n" +
+                                        "  \"cursor\": null, \n" +
+                                        "  \"dtoList\": [\n" +
+                                        "    {\n" +
+                                        "      \"ancestorIds\": [\n" +
+                                        "        0, \n" +
+                                        "        278889175415\n" +
+                                        "      ], \n" +
+                                        "      \"code\": \"1.10.36 all questions\", \n" +
+                                        "      \"createdDateTime\": 1534846914945, \n" +
+                                        "      \"dataApprovalGroupId\": null, \n" +
+                                        "      \"defaultLanguageCode\": \"en\", \n" +
+                                        "      \"description\": \"\", \n" +
+                                        "      \"keyId\": 2989762914097, \n" +
+                                        "      \"lastUpdateDateTime\": 1534846926804, \n" +
+                                        "      \"monitoringGroup\": false, \n" +
+                                        "      \"name\": \"1.10.36 all questions\", \n" +
+                                        "      \"newLocaleSurveyId\": null, \n" +
+                                        "      \"parentId\": 27888911545, \n" +
+                                        "      \"path\": \"/_1.9.36 and 2.6.0/1.10.36 all questions\", \n" +
+                                        "      \"privacyLevel\": \"PRIVATE\", \n" +
+                                        "      \"projectType\": \"PROJECT\", \n" +
+                                        "      \"published\": false, \n" +
+                                        "      \"requireDataApproval\": false, \n" +
+                                        "      \"surveyList\": null\n" +
+                                        "    }\n" +
+                                        "  ], \n" +
+                                        "  \"message\": null, \n" +
+                                        "  \"offset\": 0, \n" +
+                                        "  \"resultCount\": 0, \n" +
+                                        "  \"url\": null\n" +
+                                        "}\n";
+
+    @Test
+    void testReadSimpleJsonObject() {
+        FlowJsonObjectReader reader = new FlowJsonObjectReader();
+        TypeReference<QuestionDto> typeReference = new TypeReference<QuestionDto>() {};
+        QuestionDto testQuestionDto = null;
+        try {
+            testQuestionDto = reader.readObject(QUESTION_DTO_JSON_STRING, typeReference);
+        } catch (IOException e) {
+            // ignoring exception
+        }
+        assertEquals(QuestionDto.QuestionType.FREE_TEXT, testQuestionDto.getType());
+        assertEquals("How many toilets are present?", testQuestionDto.getText());
+        assertFalse(testQuestionDto.getDependentFlag());
+        assertEquals(12345678L, testQuestionDto.getQuestionGroupId());
+        assertEquals(QuestionDto.QuestionType.FREE_TEXT, testQuestionDto.getType());
+        assertEquals(0, testQuestionDto.getOrder());
+    }
+
+    @Test
+    void testReadComplexJsonObject() {
+        FlowJsonObjectReader reader = new FlowJsonObjectReader();
+        TypeReference<Map<String, List<CaddisflyResource>>> typeReference = new TypeReference<Map<String, List<CaddisflyResource>>>() {};
+        Map<String, List<CaddisflyResource>> resourcesMap = new HashMap<>();
+        try {
+            resourcesMap = reader.readObject(COMPLEX_JSON_OBJECT, typeReference);
+        } catch (IOException e) {
+            // ignoring exception
+        }
+
+        List<CaddisflyResource> resourcesList = resourcesMap.get("tests");
+        assertNotEquals(null, resourcesList);
+        assertEquals(2, resourcesList.size());
+        assertEquals(2, resourcesList.get(0).getResults().size());
+        assertEquals("Soil - Electrical Conductivity", resourcesList.get(0).getName());
+        assertEquals(1, resourcesList.get(1).getResults().size());
+        assertEquals("0b4a0aaa-f556-4c11-a539-c4626582cca6", resourcesList.get(1).getUuid());
+    }
+
+    @Test
+    void testDtoListResponses() {
+        FlowJsonObjectReader reader = new FlowJsonObjectReader();
+        TypeReference<SurveyGroupDto> typeReference = new TypeReference<SurveyGroupDto>() {};
+        List<SurveyGroupDto> surveyList = null;
+
+        try {
+            surveyList = reader.readDtoListObject(DTO_LIST_JSON_OBJECT, typeReference);
+        } catch (IOException e) {
+            // ignoring exception
+        }
+
+        assertNotEquals(null, surveyList);
+        assertEquals(1, surveyList.size());
+        assertEquals("1.10.36 all questions", surveyList.get(0).getName());
+    }
+}
diff --git a/GAE/src/test/java/org/akvo/flow/util/FlowJsonObjectWriterTests.java b/GAE/src/test/java/org/akvo/flow/util/FlowJsonObjectWriterTests.java
new file mode 100644
index 0000000000..9bc36a4231
--- /dev/null
+++ b/GAE/src/test/java/org/akvo/flow/util/FlowJsonObjectWriterTests.java
@@ -0,0 +1,88 @@
+/*
+ *  Copyright (C) 2019 Stichting Akvo (Akvo Foundation)
+ *
+ *  This file is part of Akvo FLOW.
+ *
+ *  Akvo FLOW is free software: you can redistribute it and modify it under the terms of
+ *  the GNU Affero General Public License (AGPL) as published by the Free Software Foundation,
+ *  either version 3 of the License or any later version.
+ *
+ *  Akvo FLOW is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU Affero General Public License included below for more details.
+ *
+ *  The full license text can also be seen at <http://www.gnu.org/licenses/agpl.html>.
+ */
+
+package test.java.org.akvo.flow.util;
+
+import com.gallatinsystems.survey.domain.Question;
+import org.akvo.flow.util.FlowJsonObjectWriter;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.util.*;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class FlowJsonObjectWriterTests {
+
+    @Test
+    void testComplexJsonObject() {
+        Map<String, Object> complexJsonObject = new LinkedHashMap<>();
+        complexJsonObject.put("nullList", null);
+        complexJsonObject.put("emptyList", new ArrayList<>());
+
+        List<Integer> listOfNumbers = new ArrayList<>();
+        listOfNumbers.add(1);
+        listOfNumbers.add(2);
+        listOfNumbers.add(3);
+        complexJsonObject.put("listOfNumbers",listOfNumbers);
+
+        List<Object> firstList = new ArrayList<>();
+        firstList.add(5345);
+        firstList.add(6587);
+        firstList.add(9987);
+
+        List<Object> secondList = new ArrayList<>();
+        secondList.add("tea");
+        secondList.add("coffee");
+
+        Map<String, List<Object>> mapOfLists = new LinkedHashMap<>();
+        mapOfLists.put("firstList", firstList);
+        mapOfLists.put("secondList", secondList);
+
+        complexJsonObject.put("mapOfLists", mapOfLists);
+
+        FlowJsonObjectWriter writer = new FlowJsonObjectWriter();
+        String jsonString = null;
+        try {
+            jsonString = writer.writeAsString(complexJsonObject);
+        } catch (IOException e) {
+            // ignoring exception
+        }
+        String jsonStringExpected = "{\"nullList\":null,\"emptyList\":[],\"listOfNumbers\":[1,2,3],\"mapOfLists\":{\"firstList\":[5345,6587,9987],\"secondList\":[\"tea\",\"coffee\"]}}";
+        assertEquals(jsonStringExpected, jsonString);
+    }
+
+    @Test
+    void testWriteSimpleJsonObjectWithExcludeNonNull() {
+
+        Question question = new Question();
+        question.setText("First Question");
+        question.setOrder(0);
+        question.setType(Question.Type.FREE_TEXT);
+        question.setAllowOtherFlag(true);
+
+        FlowJsonObjectWriter writer = new FlowJsonObjectWriter().withExcludeNullValues();
+        String jsonString = null;
+        try {
+            jsonString = writer.writeAsString(question);
+        } catch (IOException e) {
+            // ignoring exception
+        }
+
+        String jsonStringExpected = "{\"type\":\"FREE_TEXT\",\"text\":\"First Question\",\"allowOtherFlag\":true,\"collapseable\":false,\"immutable\":false,\"order\":0}";
+        assertEquals(jsonStringExpected, jsonString);
+    }
+}
diff --git a/GAE/war/WEB-INF/backends.xml b/GAE/war/WEB-INF/backends.xml
deleted file mode 100644
index 1165642f34..0000000000
--- a/GAE/war/WEB-INF/backends.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<backends>
-	<backend name="dataprocessor">
-		<class>B2</class>
-		<instances>1</instances>
-		<options>
-			<dynamic>true</dynamic>
-		</options>
-	</backend>
-</backends>
\ No newline at end of file
diff --git a/GAE/war/WEB-INF/cron.xml b/GAE/war/WEB-INF/cron.xml
index 71c6bb5438..593d33f547 100644
--- a/GAE/war/WEB-INF/cron.xml
+++ b/GAE/war/WEB-INF/cron.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cronentries>
-	<cron>
-		<url>/cron/croncommander?action=purgeExpiredSurveys</url>
-		<description>Purge expired Surveys from Device Survey Job Queue</description>
-		<schedule>every 24 hours</schedule>
-	</cron>
-	<cron>
-		<url>/cron/croncommander?action=purgeOrphanJobQueueRecords</url>
-		<description>Purge orphans from Survey Job Queue</description>
-		<schedule>every 24 hours</schedule>
-	</cron>
+    <cron>
+        <url>/cron/croncommander?action=purgeExpiredSurveys</url>
+        <description>Purge expired Surveys from Device Survey Job Queue
+        </description>
+        <schedule>every 24 hours</schedule>
+    </cron>
+    <cron>
+        <url>/cron/croncommander?action=purgeOrphanJobQueueRecords</url>
+        <description>Purge orphans from Survey Job Queue</description>
+        <schedule>every 24 hours</schedule>
+    </cron>
     <cron>
         <url>/cron/croncommander?action=generateNotifications</url>
         <description>Trigger Notification Processing</description>
diff --git a/GAE/war/WEB-INF/queue.xml b/GAE/war/WEB-INF/queue.xml
index 1738d50179..3134b35133 100644
--- a/GAE/war/WEB-INF/queue.xml
+++ b/GAE/war/WEB-INF/queue.xml
@@ -1,38 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <queue-entries>
-	<queue>
-		<name>default</name>
-		<rate>5/s</rate>
+    <queue>
+        <name>default</name>
+        <rate>5/s</rate>
         <retry-parameters>
           <task-retry-limit>10</task-retry-limit>
           <min-backoff-seconds>10</min-backoff-seconds>
         </retry-parameters>
-	</queue>
-	<queue>
-		<name>mail-queue</name>
-		<rate>2000/d</rate>
-		<bucket-size>10</bucket-size>
+    </queue>
+    <queue>
+        <name>mail-queue</name>
+        <rate>2000/d</rate>
+        <bucket-size>10</bucket-size>
         <retry-parameters>
           <task-retry-limit>10</task-retry-limit>
           <min-backoff-seconds>10</min-backoff-seconds>
         </retry-parameters>
-	</queue>
-	<queue>
-		<name>background-processing</name>
-		<rate>5/s</rate>
+    </queue>
+    <queue>
+        <name>background-processing</name>
+        <rate>5/s</rate>
         <retry-parameters>
           <task-retry-limit>10</task-retry-limit>
           <min-backoff-seconds>10</min-backoff-seconds>
         </retry-parameters>
     </queue>
-	<queue>
-		<name>dataSummarization</name>
-		<rate>5/s</rate>
+    <queue>
+        <name>dataSummarization</name>
+        <rate>5/s</rate>
         <retry-parameters>
-          <task-retry-limit>10</task-retry-limit>
-          <min-backoff-seconds>10</min-backoff-seconds>
+            <task-retry-limit>10</task-retry-limit>
+            <min-backoff-seconds>10</min-backoff-seconds>
         </retry-parameters>
-	</queue>
+    </queue>
+    <queue>
+        <name>processDeviceFile</name>
+        <!-- Ensure the same file cannot be processed more than once in parallel -->
+        <max-concurrent-requests>1</max-concurrent-requests>
+        <rate>5/s</rate>
+        <retry-parameters>
+            <task-retry-limit>10</task-retry-limit>
+            <min-backoff-seconds>10</min-backoff-seconds>
+        </retry-parameters>
+    </queue>
     <queue>
         <name>surveyResponseCount</name>
         <rate>10/s</rate>
@@ -42,54 +52,54 @@
           <task-retry-limit>0</task-retry-limit>
         </retry-parameters>
     </queue>
-	<queue>
-		<name>dataUpdate</name>
-		<rate>5/s</rate>
+    <queue>
+        <name>dataUpdate</name>
+        <rate>5/s</rate>
         <retry-parameters>
           <task-retry-limit>10</task-retry-limit>
           <min-backoff-seconds>10</min-backoff-seconds>
         </retry-parameters>
-	</queue>
-	<queue>
-		<name>spreadsheetImport</name>
-		<rate>5/s</rate>
+            </queue>
+    <queue>
+        <name>spreadsheetImport</name>
+        <rate>5/s</rate>
         <retry-parameters>
           <task-retry-limit>10</task-retry-limit>
           <min-backoff-seconds>10</min-backoff-seconds>
         </retry-parameters>
-	</queue>
-	<queue>
-		<name>surveyAssembly</name>
-		<rate>5/s</rate>
-		<bucket-size>20</bucket-size>
-		<max-concurrent-requests>10</max-concurrent-requests>
+    </queue>
+    <queue>
+        <name>surveyAssembly</name>
+        <rate>5/s</rate>
+        <bucket-size>20</bucket-size>
+        <max-concurrent-requests>10</max-concurrent-requests>
         <retry-parameters>
           <task-retry-limit>10</task-retry-limit>
           <min-backoff-seconds>10</min-backoff-seconds>
         </retry-parameters>
-	</queue>
-	<queue>
-		<name>mapAssembly</name>
-		<rate>5/s</rate>
+    </queue>
+    <queue>
+        <name>mapAssembly</name>
+        <rate>5/s</rate>
         <retry-parameters>
           <task-retry-limit>10</task-retry-limit>
           <min-backoff-seconds>10</min-backoff-seconds>
         </retry-parameters>
-	</queue>
-	<queue>
-		<name>notification</name>
-		<rate>5/s</rate>
+    </queue>
+    <queue>
+        <name>notification</name>
+        <rate>5/s</rate>
         <retry-parameters>
           <task-retry-limit>10</task-retry-limit>
           <min-backoff-seconds>10</min-backoff-seconds>
         </retry-parameters>
-	</queue>
-	<queue>
-		<name>deletequeue</name>
-		<rate>10/s</rate>
+    </queue>
+    <queue>
+        <name>deletequeue</name>
+        <rate>10/s</rate>
         <retry-parameters>
           <task-retry-limit>10</task-retry-limit>
           <min-backoff-seconds>10</min-backoff-seconds>
         </retry-parameters>
-	</queue>
+    </queue>
 </queue-entries>
\ No newline at end of file
diff --git a/GAE/war/WEB-INF/rest-servlet.xml b/GAE/war/WEB-INF/rest-servlet.xml
index 81049b2726..96a2372455 100644
--- a/GAE/war/WEB-INF/rest-servlet.xml
+++ b/GAE/war/WEB-INF/rest-servlet.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
        xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 
-    <bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter">
+    <bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter">
         <property name="messageConverters">
             <list>
                 <ref bean="jsonConverter"/>
@@ -14,11 +15,11 @@
     </bean>
 
     <bean id="jsonConverter"
-          class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter">
+          class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
         <property name="supportedMediaTypes" value="application/json"/>
     </bean>
 
-    <bean id="handlerMapping" class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping"/>
+    <bean id="handlerMapping" class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping"/>
 
     <bean name="/actions" class="org.waterforpeople.mapping.app.web.rest.ActionRestService" lazy-init="true" />
     <bean name="/approval_groups" class="org.waterforpeople.mapping.app.web.rest.ApprovalGroupRestService" lazy-init="true" />
diff --git a/GAE/war/WEB-INF/web.xml b/GAE/war/WEB-INF/web.xml
index 411457faf9..b020b982a5 100644
--- a/GAE/war/WEB-INF/web.xml
+++ b/GAE/war/WEB-INF/web.xml
@@ -273,15 +273,6 @@
         <servlet-name>TestHarness</servlet-name>
         <url-pattern>/webapp/testharness</url-pattern>
     </servlet-mapping>
-    <servlet>
-    <servlet-name>PublishSurvey</servlet-name>
-        <servlet-class>org.waterforpeople.mapping.app.web.PublishSurveyServlet</servlet-class>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>PublishSurvey</servlet-name>
-        <url-pattern>/publishsurvey</url-pattern>
-    </servlet-mapping>
-
     <servlet>
         <servlet-name>RemoteExceptionServlet</servlet-name>
         <servlet-class>com.gallatinsystems.diagnostics.app.web.RemoteExceptionRestServlet</servlet-class>
diff --git a/GAE/war/WEB-INF/webapp-security.xml b/GAE/war/WEB-INF/webapp-security.xml
index 5333f8a7d6..9e20b6f130 100644
--- a/GAE/war/WEB-INF/webapp-security.xml
+++ b/GAE/war/WEB-INF/webapp-security.xml
@@ -3,8 +3,8 @@
 <b:beans xmlns="http://www.springframework.org/schema/security"
     xmlns:b="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-    http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+    http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
 
 
     <http pattern="/admin/js/**" security="none" />
@@ -16,47 +16,50 @@
     <http pattern="/publicmap/js/**" security="none" />
 
 	<http pattern="/api/v1/**" use-expressions="true" entry-point-ref="apiEntryPoint" authentication-manager-ref="apiAuthenticationManager" >
-
-		<intercept-url pattern="/api/v1/survey_groups/**" method="GET" access="hasRole('USER')"/>
-		<intercept-url pattern="/api/v1/surveys/**" method="GET" access="hasRole('USER')"/>
-		<intercept-url pattern="/api/v1/question_groups/**" method="GET" access="hasRole('USER')"/>
-		<intercept-url pattern="/api/v1/questions/**" method="GET" access="hasRole('USER')"/>
-		<intercept-url pattern="/api/v1/question_answers" method="GET" access="hasRole('USER')"/>
-		<intercept-url pattern="/api/v1/survey_assignments/**" method="GET" access="hasRole('USER')"/>
-		<intercept-url pattern="/api/v1/surveyed_locales/**" method="GET" access="hasRole('USER')"/>
-		<intercept-url pattern="/api/v1/survey_instances/**" method="GET" access="hasRole('USER')"/>
-		<intercept-url pattern="/api/v1/device_groups/**" method="GET" access="hasRole('USER')"/>
-		<intercept-url pattern="/api/v1/devices/**" method="GET" access="hasRole('USER')"/>
-		<intercept-url pattern="/**" access="denyAll"/>
-		<custom-filter position="PRE_AUTH_FILTER" ref="apiFilter"/>
+        <intercept-url pattern="/api/v1/survey_groups/**" method="GET" access="hasRole('ROLE_USER')"/>
+        <intercept-url pattern="/api/v1/surveys/**" method="GET" access="hasRole('ROLE_USER')"/>
+        <intercept-url pattern="/api/v1/question_groups/**" method="GET" access="hasRole('ROLE_USER')"/>
+        <intercept-url pattern="/api/v1/questions/**" method="GET" access="hasRole('ROLE_USER')"/>
+        <intercept-url pattern="/api/v1/question_answers" method="GET" access="hasRole('ROLE_USER')"/>
+        <intercept-url pattern="/api/v1/survey_assignments/**" method="GET" access="hasRole('ROLE_USER')"/>
+        <intercept-url pattern="/api/v1/surveyed_locales/**" method="GET" access="hasRole('ROLE_USER')"/>
+        <intercept-url pattern="/api/v1/survey_instances/**" method="GET" access="hasRole('ROLE_USER')"/>
+        <intercept-url pattern="/api/v1/device_groups/**" method="GET" access="hasRole('ROLE_USER')"/>
+        <intercept-url pattern="/api/v1/devices/**" method="GET" access="hasRole('ROLE_USER')"/>
+        <intercept-url pattern="/**" access="denyAll"/>
+        <custom-filter position="PRE_AUTH_FILTER" ref="apiFilter"/>
 	</http>
 
     <http use-expressions="true" entry-point-ref="gaeEntryPoint" authentication-manager-ref="authenticationManager"
         access-decision-manager-ref="accessDecisionManager">
+        <headers>
+            <frame-options policy="SAMEORIGIN" />
+        </headers>
         <intercept-url pattern="/remote_api**" access="permitAll"/>
         <intercept-url pattern="/admin/logout.html" access="permitAll"/>
         <intercept-url pattern="/rest/placemark**" method="GET" access="permitAll"/>
         <intercept-url pattern="/_ah/**" access="permitAll"/>
-        <intercept-url pattern="/webapp/testharness**" access="hasRole('SUPER_ADMIN')"/>
-        <intercept-url pattern="/dashboard.html" access="hasRole('SUPER_ADMIN')"/>
+        <intercept-url pattern="/webapp/testharness**" access="hasRole('ROLE_SUPER_ADMIN')"/>
+        <intercept-url pattern="/dashboard.html" access="hasRole('ROLE_SUPER_ADMIN')"/>
         <intercept-url pattern="/rest/reports/**" method="PUT" access="permitAll"/>
-        <intercept-url pattern="/rest/users" access="hasRole('USER')"/>
-        <intercept-url pattern="/rest/user_roles" access="hasRole('ADMIN')"/>
-        <intercept-url pattern="/rest/user_auth" access="hasRole('ADMIN')"/>
-        <intercept-url pattern="/rest/**" access="hasRole('USER')"/>
-        <intercept-url pattern="/admin/**" access="hasRole('USER')"/>
+        <intercept-url pattern="/rest/users" access="hasRole('ROLE_USER')"/>
+        <intercept-url pattern="/rest/user_roles" access="hasRole('ROLE_ADMIN')"/>
+        <intercept-url pattern="/rest/user_auth" access="hasRole('ROLE_ADMIN')"/>
+        <intercept-url pattern="/rest/**" access="hasRole('ROLE_USER')"/>
+        <intercept-url pattern="/admin/**" access="hasRole('ROLE_USER')"/>
         <intercept-url pattern="/**" access="permitAll"/>
         <logout logout-success-url="/" delete-cookies="JSESSIONID"/>
 		<custom-filter position="PRE_AUTH_FILTER" ref="gaeFilter"/>
+        <csrf disabled="true" />
     </http>
 
     <b:bean id="accessDecisionManager" class="org.springframework.security.access.vote.AffirmativeBased">
-		<b:property name="decisionVoters">
+        <b:constructor-arg index="0">
 			<b:list>
 				<b:bean class="org.waterforpeople.mapping.app.web.rest.security.RequestUriVoter" />
 				<b:bean class="org.springframework.security.web.access.expression.WebExpressionVoter" />
 			</b:list>
-		</b:property>
+        </b:constructor-arg>
 	</b:bean>
 
 	<!-- API Authentication -->
diff --git a/GAE/war/js/tooltip-public.js b/GAE/war/js/tooltip-public.js
index 0bff373968..fa79af383a 100644
--- a/GAE/war/js/tooltip-public.js
+++ b/GAE/war/js/tooltip-public.js
@@ -1,4 +1,4 @@
-this.tooltip = function(){
+const tooltip = function(){
 /* CONFIG */
 xOffset = 10;
 yOffset = 20;
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 9deca154f4..0d90828851 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,53 @@
 # Akvo Flow Release Notes
 ----
+# Akvo Flow Dashboard v1.9.44 - Quintessential Quandong (Hotfix 1)
+Date: 21-03-2019
+
+# Resolved issues
+* **Deployments** - Fixed issue causing deployments to fail due to missing library [#3017]
+
+# Akvo Flow Dashboard v1.9.44 - Quintessential Quandong
+Date: 20-03-2019
+
+# New and noteworthy
+* **Development environment** - Move away from using backends which has been deprecated [#2694]. Refactored code on
+ * publishing forms [#2968]
+ * deleting cascade nodes [#2969]
+ * copying groups and surveys [#2970]
+ * updating question summaries [#2971]
+ * Data point assembly tasks
+
+
+# Resolved issues
+* **Survey design** - Fixed endless copying of question groups [#2802]
+* **Code cleanup** - Removed unused code (permissions [#3005], file-upload library [#3002])
+* **Data** - Resolved issue causing duplication of data point IDs [#2944]
+* **Development environment** - Fixed broken docker build [#3017]. Upgraded spring framework libraries to resolve security vulnerabilities in current versions [#2896]
+
+# Akvo Flow Dashboard v1.9.43 - Patient Poppy
+Date: 01-03-2019
+
+# New and noteworthy
+* **Surveys** - Make it easier to reorder options when editing questions [#2891]. Order forms alphabetically in the surveys tab but always have the registration form first for monitoring surveys [#2917]
+* **Development environment** - Upgrade spring framework libraries to fix security vulnerabilities on the repository [#2896]
+
+# Resolved issues
+* **Bug fixes** - Display reagent codes on caddisfly tests [#2842]. Fix survey bootstrap failing for new surveys [#2980]
+* **Backend** - Add mandatory flag status for questions in tree-printing script [#2978]. Avoid concurrent modification errors [#2931]
+
+# Akvo Flow Dashboard v1.9.42 - Outstanding Orange
+Date: 06-02-2019
+
+# New and noteworthy
+* **User experience** - Cascading selection of caddisfly tests in survey design [#2842]
+* **Devices** - Cleanup idle devices from the device list after a year [#2939]
+* **Surveys** - Save an archive copy of each published version of a form to the S3 bucket [#2844]
+
+# Resolved issues
+* **Bub fixes** - Truncate long error messages causing causing cascade publishing to fail silently [#2961]. Disable saving caddisfly question when no test type is selected [#1808]. Handle end point error responses [#2948]. Fix issue causing signature responses not to display on map [#2937
+* **Development environment** - Update openssl requirements [#2956]. Data script to print the tree-structure of an instance [#2958]
+* **Code cleanup** - Remove unused SMS classes [#2949]
+
 # Akvo Flow Dashboard v1.9.41.1 - Nebulous Nemesia (Hotfix 1)
 Date: 03-01-2019
 
diff --git a/ci/build.sh b/ci/build.sh
index 901a051d6f..5cb121ec8e 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -19,15 +19,11 @@
 set -e
 
 SRC_DIR="/app/src"
-BUNDLE_GEMFILE="${SRC_DIR}/Dashboard/Gemfile"
-RAKEP_MODE=production
-
-export BUNDLE_GEMFILE
-export RAKEP_MODE
 
 cd "${SRC_DIR}/Dashboard"
 
-bundle exec rake build --trace
+npm install
+npm run build:prod
 
 cd "${SRC_DIR}/Dashboard/app/cljs"
 
diff --git a/ci/devserver.sh b/ci/devserver.sh
index 543e7859dc..b56c1279ac 100755
--- a/ci/devserver.sh
+++ b/ci/devserver.sh
@@ -23,6 +23,8 @@ SRC_DIR="/app/src"
 cd "$SRC_DIR/Dashboard"
 
 bundle exec rake watchbg > "$SRC_DIR/rake.log" 2>&1 &
+bundle exec npm install &
+bundle exec npm run build:dev > "$SRC_DIR/build.dev.log" 2>&1 &
 
 if [[ ! -f "$SRC_DIR/GAE/target/akvo-flow/admin/frames/users.js" ]]; then
     cd "$SRC_DIR/Dashboard/app/cljs"
@@ -49,4 +51,4 @@ fi
 
 mvn appengine:start
 
-tail -F ./target/akvo-flow/flow0.log "$SRC_DIR/rake.log" ./target/build.log
+tail -F -n 5000  "$SRC_DIR/build.dev.log" "$SRC_DIR/rake.log" ./target/akvo-flow/flow0.log
diff --git a/ci/mvn-deploy.sh b/ci/mvn-deploy.sh
index 35e46000cd..7012ea9e51 100755
--- a/ci/mvn-deploy.sh
+++ b/ci/mvn-deploy.sh
@@ -12,15 +12,11 @@ gcloud auth activate-service-account "${SERVICE_ACCOUNT_ID}" --key-file=/app/src
 gcloud config set project "${PROJECT_ID}"
 gcloud config set compute/zone europe-west1-d
 
-version=$(git describe)
-
 log Requesting "${PROJECT_ID}" config
 
 curl --location --silent --output ./target/akvo-flow/WEB-INF/appengine-web.xml \
      "https://${GH_USER}:${GH_TOKEN}@raw.githubusercontent.com/akvo/${CONFIG_REPO}/master/${PROJECT_ID}/appengine-web.xml"
 
-sed -i "s/__VERSION__/${version}/" ./target/akvo-flow/admin/js/app.js
-
 log Staging app
 
 mvn appengine:stage
@@ -40,16 +36,7 @@ java -cp /google-cloud-sdk/platform/google_appengine/google/appengine/tools/java
      --application="${PROJECT_ID}" \
      update ./target/appengine-staging
 
-log Deploying backend dataprocessor
-
-gcloud app versions delete dataprocessor --project="${PROJECT_ID}" --quiet
-
-java -cp /google-cloud-sdk/platform/google_appengine/google/appengine/tools/java/lib/appengine-tools-api.jar \
-     com.google.appengine.tools.admin.AppCfg \
-     --service_account_json_key_file=/app/src/ci/akvoflow-uat1.json \
-     --application="${PROJECT_ID}" \
-     backends update ./target/appengine-staging
-
+version=$(git describe)
 archive_name="${version}.zip"
 (
     cd target
diff --git a/dev-deploy.sh b/dev-deploy.sh
index f35a79a895..f6d22ae5b9 100755
--- a/dev-deploy.sh
+++ b/dev-deploy.sh
@@ -14,7 +14,3 @@ fi
 java -cp /google-cloud-sdk/platform/google_appengine/google/appengine/tools/java/lib/appengine-tools-api.jar \
      com.google.appengine.tools.admin.AppCfg \
      update ./target/appengine-staging
-
-java -cp /google-cloud-sdk/platform/google_appengine/google/appengine/tools/java/lib/appengine-tools-api.jar \
-     com.google.appengine.tools.admin.AppCfg \
-     backends update ./target/appengine-staging
diff --git a/scripts/data/check-missing-files.sh b/scripts/data/check-missing-files.sh
new file mode 100755
index 0000000000..57def17eda
--- /dev/null
+++ b/scripts/data/check-missing-files.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# USAGE: ./check-missing-files.sh akvoflowsandbox
+
+APP_ID=$1
+SERVICE_ACCOUNT="sa-$APP_ID@$APP_ID.iam.gserviceaccount.com"
+P12_FILE_PATH="/home/user/src/akvo-flow-server-config/$1/$1.p12"
+
+java -cp bin:"lib/*" \
+     org.akvo.gae.remoteapi.RemoteAPI \
+     CheckMissingFiles \
+     $APP_ID \
+     $SERVICE_ACCOUNT \
+     $P12_FILE_PATH \
+     $2 $3 $4
diff --git a/scripts/data/export_auth_data_to_event_log.sh b/scripts/data/export_auth_data_to_event_log.sh
new file mode 100755
index 0000000000..5744829302
--- /dev/null
+++ b/scripts/data/export_auth_data_to_event_log.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Run the docker-compose env, so that the GAE classes are compiled
+# docker run --rm -it -v `pwd`:/root/flow -v $(pwd)/../../akvo-flow-server-config/:/p12  frekele/ant:1.10-jdk8 bash
+# cd /root/flow/scripts/data; sh export_auth_data_to_event_log.sh akvoflowsandbox
+
+APP_ID=$1
+SERVICE_ACCOUNT="sa-$APP_ID@$APP_ID.iam.gserviceaccount.com"
+P12_FILE_PATH="/p12/$1/$1.p12"
+
+ant
+ant -Dargs="ExportAuthDataToEventLog $APP_ID $SERVICE_ACCOUNT $P12_FILE_PATH $APP_ID" remoteAPI
\ No newline at end of file
diff --git a/scripts/data/fix-device-file-job-queue.sh b/scripts/data/fix-device-file-job-queue.sh
new file mode 100755
index 0000000000..fb71e4df36
--- /dev/null
+++ b/scripts/data/fix-device-file-job-queue.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# USAGE: ./fix-device-file-job-queue.sh akvoflowsandbox
+
+APP_ID=$1
+SERVICE_ACCOUNT="sa-$APP_ID@$APP_ID.iam.gserviceaccount.com"
+P12_FILE_PATH="/path/to/akvo-repositories/akvo-flow-server-config/$1/$1.p12"
+
+java -cp bin:"lib/*" \
+     org.akvo.gae.remoteapi.RemoteAPI \
+     FixDeviceFileJobQueue \
+     $APP_ID \
+     $SERVICE_ACCOUNT \
+     $P12_FILE_PATH
diff --git a/scripts/data/src/org/akvo/gae/remoteapi/CheckMissingFiles.java b/scripts/data/src/org/akvo/gae/remoteapi/CheckMissingFiles.java
new file mode 100644
index 0000000000..2e97b6a5a7
--- /dev/null
+++ b/scripts/data/src/org/akvo/gae/remoteapi/CheckMissingFiles.java
@@ -0,0 +1,80 @@
+/*
+ *  Copyright (C) 2019 Stichting Akvo (Akvo Foundation)
+ *
+ *  This file is part of Akvo FLOW.
+ *
+ *  Akvo FLOW is free software: you can redistribute it and modify it under the terms of
+ *  the GNU Affero General Public License (AGPL) as published by the Free Software Foundation,
+ *  either version 3 of the License or any later version.
+ *
+ *  Akvo FLOW is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU Affero General Public License included below for more details.
+ *
+ *  The full license text can also be seen at <http://www.gnu.org/licenses/agpl.html>.
+ */
+
+package org.akvo.gae.remoteapi;
+
+import com.google.appengine.api.datastore.DatastoreService;
+import com.google.appengine.api.datastore.Entity;
+import com.google.appengine.api.datastore.FetchOptions;
+import com.google.appengine.api.datastore.KeyFactory;
+import com.google.appengine.api.datastore.Query;
+
+import java.util.List;
+
+/*
+ * - Checks missing files listed in DeviceFileJobQueue
+ */
+public class CheckMissingFiles implements Process {
+
+    @Override
+    public void execute(DatastoreService ds, String[] args) {
+        Query deviceFileJobQueue = new Query("DeviceFileJobQueue");
+        deviceFileJobQueue.addSort("createdDateTime", Query.SortDirection.DESCENDING);
+
+        List<Entity> entities = ds.prepare(deviceFileJobQueue)
+                .asList(FetchOptions.Builder.withLimit(100));
+        System.out.println("files found " + entities.size() + " ");
+        for (Entity e : entities) {
+            final Entity device = getDevice(ds, e);
+            final Entity dataPoint = getDataPoint(ds, e);
+            String deviceIdentifier =
+                    device != null ? (String) device.getProperty("deviceIdentifier") : "null";
+            String surveyedLocaleIdentifier = dataPoint != null ? (String) dataPoint
+                    .getProperty("surveyedLocaleIdentifier") : "null";
+            System.out.println(
+                    e.getProperty("fileName")
+                            + ", " + e.getProperty("deviceId")
+                            + ", " + deviceIdentifier
+                            + ", " + surveyedLocaleIdentifier);
+        }
+    }
+
+    private Entity getDataPoint(DatastoreService ds, Entity e) {
+        if (e != null && e.getProperty("qasId") != null) {
+            final Query.Filter fs = new Query.FilterPredicate(Entity.KEY_RESERVED_PROPERTY,
+                    Query.FilterOperator.EQUAL,
+                    KeyFactory.createKey("QuestionAnswerStore", (Long) e.getProperty("qasId")));
+            final Query qs = new Query("QuestionAnswerStore").setFilter(fs);
+            Entity questionAnswer = ds.prepare(qs).asSingleEntity();
+
+            final Query.Filter fs2 = new Query.FilterPredicate(Entity.KEY_RESERVED_PROPERTY,
+                    Query.FilterOperator.EQUAL, KeyFactory.createKey("SurveyInstance",
+                    (Long) questionAnswer.getProperty("surveyInstanceId")));
+            final Query qs2 = new Query("SurveyInstance").setFilter(fs2);
+            return ds.prepare(qs2).asSingleEntity();
+        } else {
+            return null;
+        }
+    }
+
+    private Entity getDevice(DatastoreService ds, Entity e) {
+        final Query.Filter fs = new Query.FilterPredicate(Entity.KEY_RESERVED_PROPERTY,
+                Query.FilterOperator.EQUAL,
+                KeyFactory.createKey("Device", (Long) e.getProperty("deviceId")));
+        final Query qs = new Query("Device").setFilter(fs);
+        return ds.prepare(qs).asSingleEntity();
+    }
+}
diff --git a/scripts/data/src/org/akvo/gae/remoteapi/ExportAuthDataToEventLog.java b/scripts/data/src/org/akvo/gae/remoteapi/ExportAuthDataToEventLog.java
new file mode 100644
index 0000000000..5b74e1b95b
--- /dev/null
+++ b/scripts/data/src/org/akvo/gae/remoteapi/ExportAuthDataToEventLog.java
@@ -0,0 +1,62 @@
+package org.akvo.gae.remoteapi;
+
+import com.google.appengine.api.datastore.*;
+import org.akvo.flow.events.EventUtils;
+import org.akvo.flow.events.EventUtils.EventTypes;
+import org.akvo.flow.events.EventUtils.Kind;
+
+import java.util.Date;
+import java.util.Map;
+
+public class ExportAuthDataToEventLog implements Process {
+
+    private static final int BATCH_SIZE = 1000;
+    private static final String[] kinds = {Kind.USER_ROLE, Kind.USER, Kind.USER_AUTHORIZATION};
+
+    // The timestamp used for imported data.
+    private static final Date IMPORT_DATE = new Date(0);
+
+    @Override
+    public void execute(DatastoreService ds, String[] args) throws Exception {
+
+        final String orgId = args[0];
+
+        for (final String kind : kinds) {
+            System.out.println("Exporting " + kind);
+            Query kindQuery = new Query(kind);
+
+            final EventTypes eventTypes = EventUtils
+                    .getEventAndActionType(kind);
+
+            Iterable<Entity> entities = ds.prepare(kindQuery).asIterable(
+                    FetchOptions.Builder.withChunkSize(BATCH_SIZE));
+
+            int amount = 0;
+            for (Entity entity : entities) {
+                amount ++;
+                if (amount % BATCH_SIZE == 0) {
+                    System.out.println("progress " + amount);
+                }
+                Map<String, Object> event = createEvent(entity, eventTypes, orgId);
+                Date timestamp = (Date) entity.getProperty(EventUtils.Prop.LAST_UPDATE_DATE_TIME);
+                Entity eventLogEntity = EventUtils.createEventLogEntity(event, timestamp);
+                ds.put(eventLogEntity);
+            }
+
+        }
+    }
+
+    private static Map<String, Object> createEvent(Entity entity,
+            EventTypes eventTypes, String orgId) {
+
+        Map<String, Object> source = EventUtils.newSource("import");
+        Map<String, Object> context = EventUtils
+                .newContext(IMPORT_DATE, source);
+        context.put("import", true);
+        Map<String, Object> entityMap = EventUtils.newEntity(eventTypes.type,
+                entity.getKey().getId());
+        EventUtils.populateEntityProperties(eventTypes.type, entity, entityMap);
+        return EventUtils.newEvent(orgId,
+                eventTypes.action + "Created", entityMap, context);
+    }
+}
diff --git a/scripts/data/src/org/akvo/gae/remoteapi/FixDeviceFileJobQueue.java b/scripts/data/src/org/akvo/gae/remoteapi/FixDeviceFileJobQueue.java
new file mode 100644
index 0000000000..13353c7967
--- /dev/null
+++ b/scripts/data/src/org/akvo/gae/remoteapi/FixDeviceFileJobQueue.java
@@ -0,0 +1,89 @@
+/*
+ *  Copyright (C) 2018 Stichting Akvo (Akvo Foundation)
+ *
+ *  This file is part of Akvo FLOW.
+ *
+ *  Akvo FLOW is free software: you can redistribute it and modify it under the terms of
+ *  the GNU Affero General Public License (AGPL) as published by the Free Software Foundation,
+ *  either version 3 of the License or any later version.
+ *
+ *  Akvo FLOW is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU Affero General Public License included below for more details.
+ *
+ *  The full license text can also be seen at <http://www.gnu.org/licenses/agpl.html>.
+ */
+
+package org.akvo.gae.remoteapi;
+
+import static org.akvo.gae.remoteapi.DataUtils.batchSaveEntities;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.google.appengine.api.datastore.DatastoreService;
+import com.google.appengine.api.datastore.Entity;
+import com.google.appengine.api.datastore.FetchOptions;
+import com.google.appengine.api.datastore.PreparedQuery;
+import com.google.appengine.api.datastore.Query;
+import com.google.appengine.api.datastore.Query.Filter;
+import com.google.appengine.api.datastore.Query.FilterOperator;
+import com.google.appengine.api.datastore.Query.FilterPredicate;
+
+/*
+ * - Fixes bad filenames in DeviceFileJobQueue entities
+ */
+public class FixDeviceFileJobQueue implements Process {
+
+    private int allDevicesJobs = 0, jsonDeviceJobs = 0;
+    private List<Entity>fixupList = new ArrayList();
+    private boolean doBatch = true;
+    
+    @Override
+    public void execute(DatastoreService ds, String[] args) throws Exception {
+
+        processDeviceFileJobQueue(ds);
+
+        System.out.printf("#DeviceFileJobs:  %d/%d with bad filenames\n", jsonDeviceJobs, allDevicesJobs);
+     }
+
+        
+    private void processDeviceFileJobQueue(DatastoreService ds) throws InterruptedException {
+
+        System.out.println("#Processing DeviceFileJobQueue");
+        
+        //find all jobs made since we changed from wfpPhotonnnn format
+        final Query group_q = new Query("DeviceFileJobQueue");
+        final PreparedQuery pq = ds.prepare(group_q);
+
+        for (Entity job : pq.asIterable(FetchOptions.Builder.withChunkSize(500))) {
+            allDevicesJobs++;
+            String name = (String) job.getProperty("fileName");
+            if (name.endsWith("}")) { //JSON - must fix up
+                jsonDeviceJobs++;
+                String name2 = name.substring(0,name.indexOf("\""));//strip rest of JSON "container"
+                System.out.println(name + " --> " + name2);
+                job.setProperty("fileName", name2);
+                fixupList.add(job);
+                if (!doBatch) {
+                    ds.put(job);
+                    Thread.sleep(100);//short delay to lessen server load
+                } else if (fixupList.size() > 99) {
+                    // save once we have 100 victims, so that an occasional 
+                    // db failure will not ruin everything
+                    System.out.printf("#Fixing %d Jobs\n",fixupList.size());
+                    batchSaveEntities(ds, fixupList);
+                    fixupList.clear();
+                }
+
+            }
+        }
+        if (doBatch) {
+            System.out.printf("#Fixing final %d Jobs\n",fixupList.size());
+            batchSaveEntities(ds, fixupList);
+        }
+    }
+
+}
diff --git a/scripts/data/src/org/akvo/gae/remoteapi/PrintTreeStructure.java b/scripts/data/src/org/akvo/gae/remoteapi/PrintTreeStructure.java
index fc6ad5a647..49237b98bf 100644
--- a/scripts/data/src/org/akvo/gae/remoteapi/PrintTreeStructure.java
+++ b/scripts/data/src/org/akvo/gae/remoteapi/PrintTreeStructure.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2017,2019 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -23,7 +23,6 @@
 import com.google.appengine.api.datastore.DatastoreService;
 import com.google.appengine.api.datastore.Entity;
 import com.google.appengine.api.datastore.FetchOptions;
-import com.google.appengine.api.datastore.Key;
 import com.google.appengine.api.datastore.PreparedQuery;
 import com.google.appengine.api.datastore.Query;
 
@@ -44,6 +43,7 @@ public class PrintTreeStructure implements Process {
     private Map<Long, Long> qParents = new HashMap<>();
     private Map<Long, Long> qToSurvey = new HashMap<>();
     private Map<Long, Long> qOrder = new HashMap<>();
+    private Map<Long, Boolean> qMandatory = new HashMap<>();
 
     private Map<Long, String> qgNames = new HashMap<>();
     private Map<Long, Long> qgOrder= new HashMap<>();
@@ -54,7 +54,6 @@ public class PrintTreeStructure implements Process {
     private Map<Long, Long> oParents = new HashMap<>();
 
     private boolean html = false;
-    private boolean gae = false;
     private boolean showQuestions = false;
     private boolean showOptions = false;
 
@@ -67,9 +66,6 @@ public void execute(DatastoreService ds, String[] args) throws Exception {
             if (args[i].equalsIgnoreCase("--html")) {
                 html = true;
             }
-            if (args[i].equalsIgnoreCase("--gae")) {
-                gae = true;
-            }
             if (args[i].equalsIgnoreCase("--questions")) {
                 showQuestions = true;
             }
@@ -83,9 +79,9 @@ public void execute(DatastoreService ds, String[] args) throws Exception {
         if (showQuestions) {
             fetchQuestionGroups(ds);
             fetchQuestions(ds);
-	    if (showOptions) {
-		fetchOptions(ds);
-	    }
+            if (showOptions) {
+                fetchOptions(ds);
+            }
         }
 
 //        System.out.printf("/ (root)\n");
@@ -141,18 +137,20 @@ private void drawGroupsIn(Long parent, int indent) {
 
     private void drawQuestionsIn(Long parent, int indent) {
         for (Long q : qParents.keySet()) {
+            String m = (qMandatory.get(q).equals(Boolean.TRUE)) ? "*":"";
+
             if (qParents.get(q).equals(parent)) {
                 String s = "";
                 for (int i = 0; i<indent; i++) {
                     s += "  ";
                 }
                 if (qTypes.get(q).equals("OPTION")) {
-                    System.out.printf("%s?OPTION %s [%d]\n", s, qNames.get(q), q);
+                    System.out.printf("%s?OPTION%s %s [%d]\n", s, m, qNames.get(q), q);
                     if (showOptions) {
-			drawOptionsIn(q, indent+1);
-		    }
+                        drawOptionsIn(q, indent+1);
+                    }
                 } else {
-                    System.out.printf("%s?%s %s [%d]\n", s, qTypes.get(q), qNames.get(q), q);
+                    System.out.printf("%s?%s%s %s [%d]\n", s, qTypes.get(q), m, qNames.get(q), q);
                 }
             }
         }
@@ -257,6 +255,7 @@ private void fetchQuestions(DatastoreService ds) {
             String questionText = (String) q.getProperty("text");
             String qType = (String) q.getProperty("type");
             Long questionGroupSurvey = (Long) qgParents.get(questionGroup);
+            Boolean mandatory = (Boolean) q.getProperty("mandatoryFlag");
 
             if (questionGroup == null || questionGroupSurvey == null) { // in no group or a nonexistent group; hopelessly lost
                 System.out.printf("#ERR: Question [%d] '%s',survey %d, group %d\n",
@@ -267,6 +266,7 @@ private void fetchQuestions(DatastoreService ds) {
                 qNames.put(questionId, questionText);
                 qTypes.put(questionId, qType);
                 qOrder.put(questionId, order);
+                qMandatory.put(questionId, mandatory);
                 if (!questionGroupSurvey.equals(questionSurvey)) {
                     System.out.printf("#ERR: Question [%d] '%s' in survey %d, but group %d is in survey %d\n",
                             questionId, questionText, questionSurvey, questionGroup, questionGroupSurvey);
diff --git a/scripts/deploy/bootstrap-deploy.sh b/scripts/deploy/bootstrap-deploy.sh
index ddb1d83667..295e3c1c12 100755
--- a/scripts/deploy/bootstrap-deploy.sh
+++ b/scripts/deploy/bootstrap-deploy.sh
@@ -10,7 +10,8 @@ apk add --no-cache \
     openjdk8~=8 \
     parallel \
     shadow~=4.5 \
-    su-exec~=0.2
+    su-exec~=0.2 \
+    nss~=3.34 \
 
 gcloud components install app-engine-java --quiet
 rm -rf /google-cloud-sdk/.install/.backup
diff --git a/scripts/deploy/deploy.sh b/scripts/deploy/deploy.sh
index 0cbc24e82c..f0dedfeed2 100755
--- a/scripts/deploy/deploy.sh
+++ b/scripts/deploy/deploy.sh
@@ -81,12 +81,6 @@ function deploy_instance {
 	 --retain_upload_dir \
 	 --application="${instance_id}" \
 	 update "${staging_dir}"
-
-    java -cp /google-cloud-sdk/platform/google_appengine/google/appengine/tools/java/lib/appengine-tools-api.jar \
-	 com.google.appengine.tools.admin.AppCfg \
-	 --retain_upload_dir \
-	 --application="${instance_id}" \
-	 backends update "${staging_dir}"
 }
 
 export -f deploy_instance