diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1af1470..66e0666 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ image: node:latest
 stages:
   - build
   - test
+  - code_quality
   - deploy
 
 cache:
@@ -24,6 +25,15 @@ testing_testing:
     - cd smart-hut
     - yarn test
 
+sonar-scanner:
+  stage: code_quality
+  only:
+    - dev
+  script:
+    - cd smart-hut
+    - yarn eslint:report || true
+    - yarn sonar-scanner -Dsonar.host.url=$SONAR_URL -Dsonar.login=$SONAR_LOGIN -Dsonar.projectName=$CI_PROJECT_PATH_SLUG -Dsonar.projectKey=$CI_PROJECT_PATH_SLUG -Dsonar.exclusion=cypress -Dsonar.sources=src -Dsonar.javascript.file.suffixes=.js,.jsx -Dsonar.sourceEncoding=UTF-8 -Dsonar.scm.disabled=True -Dsonar.eslint.reportPaths=eslint-report.json
+
 smartHut_deploy:
   stage: deploy
   tags:
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..3886c55
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,8 @@
+Claudio Maggioni <maggicl@usi.ch> Claudio Maggioni (maggicl) <maggicl@kolabnow.ch>
+Claudio Maggioni <maggicl@usi.ch> Claudio Maggioni (maggicl) <maggicl@usi.ch>
+Filippo Cesana <cesanf@usi.ch> FilippoCesana <cesanf@usi.ch>
+Filippo Cesana <cesanf@usi.ch> Fil Cesana <cesanf@usi.ch>
+Andrea Brites Marto <britea@usi.ch> britea <andreabritesma@gmail.com>
+Christian Capeáns Pérez <capeac@usi.ch> christiancp <capeac@usi.ch>
+Tommaso Rodolfo Masera <rodolt@usi.ch> tommi27 <tommi99@hotmail.it>
+
diff --git a/hooks/pre-commit.sh b/hooks/pre-commit.sh
index 2b233cc..6b0c5cd 100755
--- a/hooks/pre-commit.sh
+++ b/hooks/pre-commit.sh
@@ -1,10 +1,11 @@
 #!/bin/sh
 
-FILES=$(git diff --cached --name-only --diff-filter=ACMR "*.js" "*.jsx" | sed 's| |\\ |g')
-[ -z "$FILES" ] && exit 0
+FILES=$(git diff --cached --name-only --diff-filter=ACMR | sed 's| |\\ |g')
 
 # Prettify all selected files
-echo "$FILES" | xargs ./smart-hut/node_modules/.bin/prettier --write
+cd $(git rev-parse --show-toplevel)/smart-hut
+npm run eslint-fix
+cd ..
 
 # Add back the modified/prettified files to staging
 echo "$FILES" | xargs git add
diff --git a/smart-hut/.eslintrc b/smart-hut/.eslintrc
new file mode 100644
index 0000000..ed73165
--- /dev/null
+++ b/smart-hut/.eslintrc
@@ -0,0 +1,54 @@
+{
+  "parser": "babel-eslint",
+  "parserOptions": {
+    "ecmaVersion": 2020,
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "jsx": true
+    }
+  },
+  "rules": {
+    "semi": "error",
+    "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
+    "react/jsx-no-bind": [
+      "error",
+      {
+        "allowArrowFunctions": true,
+        "allowBind": false,
+        "ignoreRefs": true
+      }
+    ],
+    "react/no-did-update-set-state": "error",
+    "react/no-unknown-property": "error",
+    "react/no-unused-prop-types": "error",
+    "react/prop-types": "error",
+    "react/react-in-jsx-scope": "error",
+    "no-unused-expressions": 0,
+    "chai-friendly/no-unused-expressions": 2,
+    "indent": [0, 4]
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:react/recommended",
+    "airbnb"
+  ],
+  "env": {
+    "node": true,
+    "browser": true,
+    "jest": true
+  },
+
+  "globals": {
+    "Atomics": "readonly",
+    "SharedArrayBuffer": "readonly"
+  },
+
+  "settings": {
+    "react": {
+      "version": "detect"
+    }
+  },
+
+  "plugins": ["react", "chai-friendly"]
+}
+
diff --git a/smart-hut/package-lock.json b/smart-hut/package-lock.json
index d39ace7..188d272 100644
--- a/smart-hut/package-lock.json
+++ b/smart-hut/package-lock.json
@@ -4,6 +4,11 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@ant-design/css-animation": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/@ant-design/css-animation/-/css-animation-1.7.2.tgz",
+      "integrity": "sha512-bvVOe7A+r7lws58B7r+fgnQDK90cV45AXuvGx6i5CCSX1W/M3AJnHsNggDANBxEtWdNdFWcDd5LorB+RdSIlBw=="
+    },
     "@babel/code-frame": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
@@ -1075,6 +1080,14 @@
       "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
       "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
     },
+    "@giantmachines/redux-websocket": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@giantmachines/redux-websocket/-/redux-websocket-1.2.0.tgz",
+      "integrity": "sha512-87GXE32CnsA9/AA7jVDQupWLmycHAuoWPwNCTz2YnlRR1l8EqLlOJK6SyeMQaVRIuAvM5B7e06dylmaS9Jlgnw==",
+      "requires": {
+        "redux": "~4"
+      }
+    },
     "@hapi/address": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz",
@@ -1384,6 +1397,12 @@
       "resolved": "https://registry.npmjs.org/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.2.tgz",
       "integrity": "sha512-vTCdPp/T/Q3oSqwHmZ5Kpa9oI7iLtGl3RQaA/NyLHikvcrPxACkkKVr/XzkSPJWXHRhKGzVvb0urJsbMlRxi1Q=="
     },
+    "@sindresorhus/is": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
+      "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==",
+      "dev": true
+    },
     "@stardust-ui/react-component-event-listener": {
       "version": "0.38.0",
       "resolved": "https://registry.npmjs.org/@stardust-ui/react-component-event-listener/-/react-component-event-listener-0.38.0.tgz",
@@ -1985,6 +2004,14 @@
       "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
       "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA=="
     },
+    "add-dom-event-listener": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz",
+      "integrity": "sha512-WCxx1ixHT0GQU9hb0KI/mhgRQhnU+U3GvwY6ZvVjYq8rsihIGoaIOUbY0yMPBxLH5MDtr0kz3fisWGNcbWW7Jw==",
+      "requires": {
+        "object-assign": "4.x"
+      }
+    },
     "address": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/address/-/address-1.1.2.tgz",
@@ -2080,6 +2107,15 @@
         "type-fest": "^0.8.1"
       }
     },
+    "ansi-gray": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
+      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
+      "dev": true,
+      "requires": {
+        "ansi-wrap": "0.1.0"
+      }
+    },
     "ansi-html": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
@@ -2098,6 +2134,12 @@
         "color-convert": "^1.9.0"
       }
     },
+    "ansi-wrap": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
+      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
+      "dev": true
+    },
     "anymatch": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
@@ -2112,6 +2154,23 @@
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
       "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
     },
+    "archive-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-4.0.0.tgz",
+      "integrity": "sha1-+S5yIzBW38aWlHJ0nCZ72wRrHXA=",
+      "dev": true,
+      "requires": {
+        "file-type": "^4.2.0"
+      },
+      "dependencies": {
+        "file-type": {
+          "version": "4.4.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz",
+          "integrity": "sha1-G2AOX8ofvcboDApwxxyNul95BsU=",
+          "dev": true
+        }
+      }
+    },
     "argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
@@ -2718,6 +2777,48 @@
         "file-uri-to-path": "1.0.0"
       }
     },
+    "bl": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
+      "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^2.3.5",
+        "safe-buffer": "^5.1.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "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.0"
+          }
+        }
+      }
+    },
     "bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -2949,6 +3050,34 @@
         }
       }
     },
+    "buffer-alloc": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
+      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+      "dev": true,
+      "requires": {
+        "buffer-alloc-unsafe": "^1.1.0",
+        "buffer-fill": "^1.0.0"
+      }
+    },
+    "buffer-alloc-unsafe": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
+      "dev": true
+    },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true
+    },
+    "buffer-fill": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
+      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
+      "dev": true
+    },
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
@@ -3025,6 +3154,72 @@
         "unset-value": "^1.0.0"
       }
     },
+    "cacheable-request": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz",
+      "integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=",
+      "dev": true,
+      "requires": {
+        "clone-response": "1.0.2",
+        "get-stream": "3.0.0",
+        "http-cache-semantics": "3.8.1",
+        "keyv": "3.0.0",
+        "lowercase-keys": "1.0.0",
+        "normalize-url": "2.0.1",
+        "responselike": "1.0.2"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+          "dev": true
+        },
+        "lowercase-keys": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
+          "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=",
+          "dev": true
+        },
+        "normalize-url": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
+          "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
+          "dev": true,
+          "requires": {
+            "prepend-http": "^2.0.0",
+            "query-string": "^5.0.1",
+            "sort-keys": "^2.0.0"
+          }
+        },
+        "prepend-http": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+          "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
+          "dev": true
+        },
+        "query-string": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
+          "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
+          "dev": true,
+          "requires": {
+            "decode-uri-component": "^0.2.0",
+            "object-assign": "^4.1.0",
+            "strict-uri-encode": "^1.0.0"
+          }
+        },
+        "sort-keys": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
+          "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=",
+          "dev": true,
+          "requires": {
+            "is-plain-obj": "^1.0.0"
+          }
+        }
+      }
+    },
     "call-me-maybe": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
@@ -3104,6 +3299,18 @@
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
+    "caw": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz",
+      "integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==",
+      "dev": true,
+      "requires": {
+        "get-proxy": "^2.0.0",
+        "isurl": "^1.0.0-alpha5",
+        "tunnel-agent": "^0.6.0",
+        "url-to-options": "^1.0.1"
+      }
+    },
     "chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -3302,6 +3509,15 @@
         "shallow-clone": "^0.1.2"
       }
     },
+    "clone-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+      "dev": true,
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
     "clsx": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.0.tgz",
@@ -3367,6 +3583,12 @@
         "simple-swizzle": "^0.2.2"
       }
     },
+    "color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "dev": true
+    },
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -3485,6 +3707,16 @@
         }
       }
     },
+    "config-chain": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz",
+      "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==",
+      "dev": true,
+      "requires": {
+        "ini": "^1.3.4",
+        "proto-list": "~1.2.1"
+      }
+    },
     "confusing-browser-globals": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz",
@@ -4002,6 +4234,151 @@
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
     },
+    "decompress": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz",
+      "integrity": "sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==",
+      "dev": true,
+      "requires": {
+        "decompress-tar": "^4.0.0",
+        "decompress-tarbz2": "^4.0.0",
+        "decompress-targz": "^4.0.0",
+        "decompress-unzip": "^4.0.1",
+        "graceful-fs": "^4.1.10",
+        "make-dir": "^1.0.0",
+        "pify": "^2.3.0",
+        "strip-dirs": "^2.0.0"
+      },
+      "dependencies": {
+        "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"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+              "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+              "dev": true
+            }
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "dev": true,
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "decompress-tar": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz",
+      "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==",
+      "dev": true,
+      "requires": {
+        "file-type": "^5.2.0",
+        "is-stream": "^1.1.0",
+        "tar-stream": "^1.5.2"
+      },
+      "dependencies": {
+        "file-type": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
+          "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
+          "dev": true
+        }
+      }
+    },
+    "decompress-tarbz2": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz",
+      "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==",
+      "dev": true,
+      "requires": {
+        "decompress-tar": "^4.1.0",
+        "file-type": "^6.1.0",
+        "is-stream": "^1.1.0",
+        "seek-bzip": "^1.0.5",
+        "unbzip2-stream": "^1.0.9"
+      },
+      "dependencies": {
+        "file-type": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz",
+          "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==",
+          "dev": true
+        }
+      }
+    },
+    "decompress-targz": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz",
+      "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==",
+      "dev": true,
+      "requires": {
+        "decompress-tar": "^4.1.1",
+        "file-type": "^5.2.0",
+        "is-stream": "^1.1.0"
+      },
+      "dependencies": {
+        "file-type": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
+          "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
+          "dev": true
+        }
+      }
+    },
+    "decompress-unzip": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz",
+      "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=",
+      "dev": true,
+      "requires": {
+        "file-type": "^3.8.0",
+        "get-stream": "^2.2.0",
+        "pify": "^2.3.0",
+        "yauzl": "^2.4.2"
+      },
+      "dependencies": {
+        "file-type": {
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
+          "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
+          "dev": true
+        },
+        "get-stream": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
+          "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
+          "dev": true,
+          "requires": {
+            "object-assign": "^4.0.1",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
     "deep-equal": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
@@ -4236,6 +4613,11 @@
         "esutils": "^2.0.2"
       }
     },
+    "dom-align": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/dom-align/-/dom-align-1.11.1.tgz",
+      "integrity": "sha512-hN42DmUgtweBx0iBjDLO4WtKOMcK8yBmPx/fgdsgQadLuzPu/8co3oLdK5yMmeM/vnUd3yDyV6qV8/NzxBexQg=="
+    },
     "dom-converter": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
@@ -4331,11 +4713,54 @@
       "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
       "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="
     },
+    "download": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/download/-/download-7.1.0.tgz",
+      "integrity": "sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ==",
+      "dev": true,
+      "requires": {
+        "archive-type": "^4.0.0",
+        "caw": "^2.0.1",
+        "content-disposition": "^0.5.2",
+        "decompress": "^4.2.0",
+        "ext-name": "^5.0.0",
+        "file-type": "^8.1.0",
+        "filenamify": "^2.0.0",
+        "get-stream": "^3.0.0",
+        "got": "^8.3.1",
+        "make-dir": "^1.2.0",
+        "p-event": "^2.1.0",
+        "pify": "^3.0.0"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+          "dev": true
+        },
+        "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"
+          }
+        }
+      }
+    },
     "duplexer": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
       "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E="
     },
+    "duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+      "dev": true
+    },
     "duplexify": {
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
@@ -4661,6 +5086,28 @@
         }
       }
     },
+    "eslint-config-airbnb": {
+      "version": "18.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-18.1.0.tgz",
+      "integrity": "sha512-kZFuQC/MPnH7KJp6v95xsLBf63G/w7YqdPfQ0MUanxQ7zcKUNG8j+sSY860g3NwCBOa62apw16J6pRN+AOgXzw==",
+      "dev": true,
+      "requires": {
+        "eslint-config-airbnb-base": "^14.1.0",
+        "object.assign": "^4.1.0",
+        "object.entries": "^1.1.1"
+      }
+    },
+    "eslint-config-airbnb-base": {
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.1.0.tgz",
+      "integrity": "sha512-+XCcfGyCnbzOnktDVhwsCAx+9DmrzEmuwxyHUJpw+kqBVT744OUBrB09khgFKlK1lshVww6qXGsYPZpavoNjJw==",
+      "dev": true,
+      "requires": {
+        "confusing-browser-globals": "^1.0.9",
+        "object.assign": "^4.1.0",
+        "object.entries": "^1.1.1"
+      }
+    },
     "eslint-config-react-app": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-5.2.0.tgz",
@@ -4775,6 +5222,12 @@
         }
       }
     },
+    "eslint-plugin-chai-friendly": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-chai-friendly/-/eslint-plugin-chai-friendly-0.6.0.tgz",
+      "integrity": "sha512-Uvvv1gkbRGp/qfN15B0kQyQWg+oFA8buDSqrwmW3egNSk/FpqH2MjQqKOuKwmEL6w4QIQrIjDp+gg6kGGmD3oQ==",
+      "dev": true
+    },
     "eslint-plugin-flowtype": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-4.6.0.tgz",
@@ -5238,6 +5691,25 @@
         }
       }
     },
+    "ext-list": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
+      "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
+      "dev": true,
+      "requires": {
+        "mime-db": "^1.28.0"
+      }
+    },
+    "ext-name": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz",
+      "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
+      "dev": true,
+      "requires": {
+        "ext-list": "^2.0.0",
+        "sort-keys-length": "^1.0.0"
+      }
+    },
     "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -5341,6 +5813,18 @@
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
+    "fancy-log": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+      "dev": true,
+      "requires": {
+        "ansi-gray": "^0.1.1",
+        "color-support": "^1.1.3",
+        "parse-node-version": "^1.0.0",
+        "time-stamp": "^1.0.0"
+      }
+    },
     "fast-deep-equal": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
@@ -5435,6 +5919,15 @@
         }
       }
     },
+    "fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+      "dev": true,
+      "requires": {
+        "pend": "~1.2.0"
+      }
+    },
     "figgy-pudding": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
@@ -5465,12 +5958,35 @@
         "schema-utils": "^2.5.0"
       }
     },
+    "file-type": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-8.1.0.tgz",
+      "integrity": "sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==",
+      "dev": true
+    },
     "file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
       "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
       "optional": true
     },
+    "filename-reserved-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
+      "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=",
+      "dev": true
+    },
+    "filenamify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz",
+      "integrity": "sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==",
+      "dev": true,
+      "requires": {
+        "filename-reserved-regex": "^2.0.0",
+        "strip-outer": "^1.0.0",
+        "trim-repeated": "^1.0.0"
+      }
+    },
     "filesize": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/filesize/-/filesize-6.0.1.tgz",
@@ -5726,6 +6242,12 @@
         }
       }
     },
+    "fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "dev": true
+    },
     "fs-extra": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
@@ -5820,6 +6342,15 @@
       "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
       "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="
     },
+    "get-proxy": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz",
+      "integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==",
+      "dev": true,
+      "requires": {
+        "npm-conf": "^1.1.0"
+      }
+    },
     "get-stream": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -5923,11 +6454,50 @@
         }
       }
     },
+    "got": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz",
+      "integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==",
+      "dev": true,
+      "requires": {
+        "@sindresorhus/is": "^0.7.0",
+        "cacheable-request": "^2.1.1",
+        "decompress-response": "^3.3.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^3.0.0",
+        "into-stream": "^3.1.0",
+        "is-retry-allowed": "^1.1.0",
+        "isurl": "^1.0.0-alpha5",
+        "lowercase-keys": "^1.0.0",
+        "mimic-response": "^1.0.0",
+        "p-cancelable": "^0.4.0",
+        "p-timeout": "^2.0.1",
+        "pify": "^3.0.0",
+        "safe-buffer": "^5.1.1",
+        "timed-out": "^4.0.1",
+        "url-parse-lax": "^3.0.0",
+        "url-to-options": "^1.0.1"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+          "dev": true
+        }
+      }
+    },
     "graceful-fs": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
       "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
     },
+    "graceful-readlink": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
+      "dev": true
+    },
     "growly": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
@@ -6006,11 +6576,26 @@
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
+    "has-symbol-support-x": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
+      "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
+      "dev": true
+    },
     "has-symbols": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
       "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
     },
+    "has-to-string-tag-x": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
+      "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
+      "dev": true,
+      "requires": {
+        "has-symbol-support-x": "^1.4.1"
+      }
+    },
     "has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
@@ -6242,6 +6827,12 @@
         }
       }
     },
+    "http-cache-semantics": {
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
+      "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
+      "dev": true
+    },
     "http-deceiver": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
@@ -6356,6 +6947,14 @@
       "resolved": "https://registry.npmjs.org/immer/-/immer-1.10.0.tgz",
       "integrity": "sha512-O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg=="
     },
+    "immutability-helper": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/immutability-helper/-/immutability-helper-3.0.2.tgz",
+      "integrity": "sha512-fcrJ26wpvUcuGRpoGY4hyQ/JOeR1HAunMmE3C0XYXSe6plAGtgTlB2S4BzueBANCPrDJ7AByL1yrIRLIlVfwpA==",
+      "requires": {
+        "invariant": "^2.2.4"
+      }
+    },
     "import-cwd": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
@@ -6458,6 +7057,24 @@
         "ipaddr.js": "^1.9.0"
       }
     },
+    "into-stream": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
+      "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=",
+      "dev": true,
+      "requires": {
+        "from2": "^2.1.1",
+        "p-is-promise": "^1.1.0"
+      },
+      "dependencies": {
+        "p-is-promise": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
+          "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
+          "dev": true
+        }
+      }
+    },
     "invariant": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
@@ -6621,6 +7238,12 @@
       "resolved": "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz",
       "integrity": "sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU="
     },
+    "is-natural-number": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz",
+      "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=",
+      "dev": true
+    },
     "is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -6634,6 +7257,12 @@
       "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
       "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="
     },
+    "is-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
+      "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
+      "dev": true
+    },
     "is-path-cwd": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
@@ -6691,6 +7320,12 @@
       "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
       "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
     },
+    "is-retry-allowed": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
+      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
+      "dev": true
+    },
     "is-root": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz",
@@ -6825,6 +7460,16 @@
         "html-escaper": "^2.0.0"
       }
     },
+    "isurl": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
+      "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
+      "dev": true,
+      "requires": {
+        "has-to-string-tag-x": "^1.2.0",
+        "is-object": "^1.0.1"
+      }
+    },
     "jest": {
       "version": "24.9.0",
       "resolved": "https://registry.npmjs.org/jest/-/jest-24.9.0.tgz",
@@ -7890,6 +8535,12 @@
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
     },
+    "json-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
+      "dev": true
+    },
     "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",
@@ -8051,6 +8702,15 @@
       "resolved": "https://registry.npmjs.org/keyboard-key/-/keyboard-key-1.1.0.tgz",
       "integrity": "sha512-qkBzPTi3rlAKvX7k0/ub44sqOfXeLc/jcnGGmj5c7BJpU8eDrEVPyhCvNYAaoubbsLm9uGWwQJO1ytQK1a9/dQ=="
     },
+    "keyv": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz",
+      "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==",
+      "dev": true,
+      "requires": {
+        "json-buffer": "3.0.0"
+      }
+    },
     "killable": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
@@ -8224,6 +8884,12 @@
       "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
       "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
     },
+    "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.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -8277,6 +8943,12 @@
         "tslib": "^1.10.0"
       }
     },
+    "lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "dev": true
+    },
     "lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -8517,6 +9189,12 @@
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
     },
+    "mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "dev": true
+    },
     "min-indent": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.0.tgz",
@@ -8953,6 +9631,16 @@
         "sort-keys": "^1.0.0"
       }
     },
+    "npm-conf": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz",
+      "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
+      "dev": true,
+      "requires": {
+        "config-chain": "^1.1.11",
+        "pify": "^3.0.0"
+      }
+    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -9216,6 +9904,12 @@
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
+    "p-cancelable": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
+      "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==",
+      "dev": true
+    },
     "p-defer": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
@@ -9229,6 +9923,15 @@
         "p-reduce": "^1.0.0"
       }
     },
+    "p-event": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/p-event/-/p-event-2.3.1.tgz",
+      "integrity": "sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA==",
+      "dev": true,
+      "requires": {
+        "p-timeout": "^2.0.1"
+      }
+    },
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@@ -9276,6 +9979,15 @@
         "retry": "^0.12.0"
       }
     },
+    "p-timeout": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz",
+      "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==",
+      "dev": true,
+      "requires": {
+        "p-finally": "^1.0.0"
+      }
+    },
     "p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
@@ -9371,6 +10083,12 @@
         "json-parse-better-errors": "^1.0.1"
       }
     },
+    "parse-node-version": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
+      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
+      "dev": true
+    },
     "parse5": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
@@ -9458,6 +10176,12 @@
         "sha.js": "^2.4.8"
       }
     },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "dev": true
+    },
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -10566,6 +11290,12 @@
         "react-is": "^16.8.1"
       }
     },
+    "proto-list": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+      "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
+      "dev": true
+    },
     "proxy-addr": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
@@ -10715,6 +11445,73 @@
         }
       }
     },
+    "rc-align": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/rc-align/-/rc-align-3.0.0.tgz",
+      "integrity": "sha512-/T/4LOlKJLFe8EwsORuc3pFWOJ8caUpj2vtKIHWea4PhakoleM7KDQsx0n1WDQENIeSfrP9P1FowVxAdvhjsvw==",
+      "requires": {
+        "classnames": "2.x",
+        "dom-align": "^1.7.0",
+        "rc-util": "^4.12.0",
+        "resize-observer-polyfill": "^1.5.1"
+      }
+    },
+    "rc-animate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-3.0.0.tgz",
+      "integrity": "sha512-+ANeyCei4lWSJHWTcocywdYAy6lpRdBva/7Fs3nBBiAngW/W+Gmx+gQEcsmcgQBqziWUYnR91Bk12ltR3GBHPA==",
+      "requires": {
+        "@ant-design/css-animation": "^1.7.2",
+        "classnames": "^2.2.6",
+        "raf": "^3.4.0",
+        "rc-util": "^4.15.3"
+      }
+    },
+    "rc-slider": {
+      "version": "9.2.4",
+      "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-9.2.4.tgz",
+      "integrity": "sha512-wSr7vz+WtzzGqsGU2rTQ4mmLz9fkuIDMPYMYm8ygYFvxQ2Rh4uRhOWHYI0R8krNK5k1bGycckYxmQqUIvLAh3w==",
+      "requires": {
+        "babel-runtime": "6.x",
+        "classnames": "^2.2.5",
+        "rc-tooltip": "^4.0.0",
+        "rc-util": "^4.0.4",
+        "shallowequal": "^1.1.0",
+        "warning": "^4.0.3"
+      }
+    },
+    "rc-tooltip": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-4.0.3.tgz",
+      "integrity": "sha512-HNyBh9/fPdds0DXja8JQX0XTIHmZapB3lLzbdn74aNSxXG1KUkt+GK4X1aOTRY5X9mqm4uUKdeFrn7j273H8gw==",
+      "requires": {
+        "rc-trigger": "^4.0.0"
+      }
+    },
+    "rc-trigger": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-4.1.0.tgz",
+      "integrity": "sha512-EyQjO6aHDAPRvJeyPmg/yVL/8Bp7oA6Lf+4Ay2OyOwhZLzHHN8m+F2XrVWKpjg04eBXbuGBNiucIqv1d/ddE3w==",
+      "requires": {
+        "classnames": "^2.2.6",
+        "raf": "^3.4.1",
+        "rc-align": "^3.0.0-rc.0",
+        "rc-animate": "^3.0.0",
+        "rc-util": "^4.20.0"
+      }
+    },
+    "rc-util": {
+      "version": "4.20.5",
+      "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.20.5.tgz",
+      "integrity": "sha512-f67s4Dt1quBYhrVPq5QMKmK3eS2hN1NNIAyhaiG0HmvqiGYAXMQ7SP2AlGqv750vnzhJs38JklbkWT1/wjhFPg==",
+      "requires": {
+        "add-dom-event-listener": "^1.1.0",
+        "prop-types": "^15.5.10",
+        "react-is": "^16.12.0",
+        "react-lifecycles-compat": "^3.0.4",
+        "shallowequal": "^1.1.0"
+      }
+    },
     "react": {
       "version": "16.12.0",
       "resolved": "https://registry.npmjs.org/react/-/react-16.12.0.tgz",
@@ -10753,6 +11550,11 @@
       "resolved": "https://registry.npmjs.org/react-circular-slider-svg/-/react-circular-slider-svg-0.1.5.tgz",
       "integrity": "sha512-ZXSlwKHExjb950+84gydH5wxX1CnND1v4w1DywOHcOgzD48Wmjr+nME4JeOumNJ9QOXhm1HROhSEDMlTFIAGqw=="
     },
+    "react-confirm-alert": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/react-confirm-alert/-/react-confirm-alert-2.6.1.tgz",
+      "integrity": "sha512-KxlpQoR4x/ET1oFPm/IGpsqnpzP17qkkQZuaO3pw7zGZ9oP5hElPtq/1vgoikoqNHQ2tMm6Iw9HQUNLoNgXkRA=="
+    },
     "react-dev-utils": {
       "version": "10.2.0",
       "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.2.0.tgz",
@@ -10937,6 +11739,11 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz",
       "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q=="
     },
+    "react-lifecycles-compat": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
+      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
+    },
     "react-modal": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-2.2.2.tgz",
@@ -10968,6 +11775,27 @@
         "warning": "^4.0.2"
       }
     },
+    "react-rangeslider": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/react-rangeslider/-/react-rangeslider-2.2.0.tgz",
+      "integrity": "sha512-5K7Woa+cyqZ5wiW5+KhqGV+3+FiFxGKQ9rUxTMh52sObXVYEeBbfxFrp1eBvS8mRIxnUbHz9ppnFP0LhwOyNeg==",
+      "requires": {
+        "classnames": "^2.2.3",
+        "resize-observer-polyfill": "^1.4.2"
+      }
+    },
+    "react-redux": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.0.tgz",
+      "integrity": "sha512-EvCAZYGfOLqwV7gh849xy9/pt55rJXPwmYvI4lilPM5rUT/1NxuuN59ipdBksRVSvz0KInbPnp4IfoXJXCqiDA==",
+      "requires": {
+        "@babel/runtime": "^7.5.5",
+        "hoist-non-react-statics": "^3.3.0",
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.7.2",
+        "react-is": "^16.9.0"
+      }
+    },
     "react-round-slider": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/react-round-slider/-/react-round-slider-1.0.1.tgz",
@@ -11163,6 +11991,20 @@
         "strip-indent": "^3.0.0"
       }
     },
+    "redux": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-4.0.5.tgz",
+      "integrity": "sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w==",
+      "requires": {
+        "loose-envify": "^1.4.0",
+        "symbol-observable": "^1.2.0"
+      }
+    },
+    "redux-thunk": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.3.0.tgz",
+      "integrity": "sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw=="
+    },
     "regenerate": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
@@ -11382,6 +12224,11 @@
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
     },
+    "resize-observer-polyfill": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
+    },
     "resolve": {
       "version": "1.15.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.0.tgz",
@@ -11473,6 +12320,15 @@
         }
       }
     },
+    "responselike": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
+      "dev": true,
+      "requires": {
+        "lowercase-keys": "^1.0.0"
+      }
+    },
     "restore-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
@@ -11676,6 +12532,26 @@
         "ajv-keywords": "^3.4.1"
       }
     },
+    "seek-bzip": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz",
+      "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
+      "dev": true,
+      "requires": {
+        "commander": "~2.8.1"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.8.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
+          "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
+          "dev": true,
+          "requires": {
+            "graceful-readlink": ">= 1.0.0"
+          }
+        }
+      }
+    },
     "select-hose": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
@@ -11971,6 +12847,12 @@
         }
       }
     },
+    "slugify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.4.0.tgz",
+      "integrity": "sha512-FtLNsMGBSRB/0JOE2A0fxlqjI6fJsgHGS13iTuVT28kViI4JjUiNqp/vyis0ZXYcMnpR3fzGNkv+6vRlI2GwdQ==",
+      "dev": true
+    },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -12121,6 +13003,78 @@
         }
       }
     },
+    "sonarqube-scanner": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/sonarqube-scanner/-/sonarqube-scanner-2.6.0.tgz",
+      "integrity": "sha512-H6DKMW2WBjFAZ81ubscwE803aiaTQCBeOIu+STrACRdNtrw6WmRmUvw5JY5eGxs/Q+ysyEvz4hInWn0h+7YAlQ==",
+      "dev": true,
+      "requires": {
+        "download": "^7.1.0",
+        "extend": "3.0.2",
+        "fancy-log": "^1.3.3",
+        "lodash.get": "^4.4.2",
+        "lodash.uniq": "^4.5.0",
+        "mkdirp": "^1.0.3",
+        "progress": "^2.0.3",
+        "read-pkg": "2.0.0",
+        "slugify": "^1.4.0"
+      },
+      "dependencies": {
+        "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.2",
+            "parse-json": "^2.2.0",
+            "pify": "^2.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "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.2.0"
+          }
+        },
+        "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.0.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.3.2",
+            "path-type": "^2.0.0"
+          }
+        }
+      }
+    },
     "sort-keys": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
@@ -12129,6 +13083,15 @@
         "is-plain-obj": "^1.0.0"
       }
     },
+    "sort-keys-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz",
+      "integrity": "sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=",
+      "dev": true,
+      "requires": {
+        "sort-keys": "^1.0.0"
+      }
+    },
     "source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -12514,6 +13477,15 @@
         "babel-plugin-transform-object-rest-spread": "^6.26.0"
       }
     },
+    "strip-dirs": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz",
+      "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==",
+      "dev": true,
+      "requires": {
+        "is-natural-number": "^4.0.1"
+      }
+    },
     "strip-eof": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
@@ -12532,6 +13504,15 @@
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
       "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw=="
     },
+    "strip-outer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
+      "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.2"
+      }
+    },
     "style-loader": {
       "version": "0.23.1",
       "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz",
@@ -12625,6 +13606,11 @@
         "util.promisify": "~1.0.0"
       }
     },
+    "symbol-observable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
+      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
+    },
     "symbol-tree": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
@@ -12668,6 +13654,53 @@
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
       "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
     },
+    "tar-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
+      "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
+      "dev": true,
+      "requires": {
+        "bl": "^1.0.0",
+        "buffer-alloc": "^1.2.0",
+        "end-of-stream": "^1.0.0",
+        "fs-constants": "^1.0.0",
+        "readable-stream": "^2.3.0",
+        "to-buffer": "^1.1.1",
+        "xtend": "^4.0.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "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.0"
+          }
+        }
+      }
+    },
     "terser": {
       "version": "4.6.4",
       "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.4.tgz",
@@ -12843,6 +13876,18 @@
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
       "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
     },
+    "time-stamp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
+      "dev": true
+    },
+    "timed-out": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
+      "dev": true
+    },
     "timers-browserify": {
       "version": "2.0.11",
       "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
@@ -12884,6 +13929,12 @@
       "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
       "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
     },
+    "to-buffer": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
+      "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==",
+      "dev": true
+    },
     "to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@@ -12939,6 +13990,15 @@
         "punycode": "^2.1.0"
       }
     },
+    "trim-repeated": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
+      "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.2"
+      }
+    },
     "ts-pnp": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.1.5.tgz",
@@ -13017,6 +14077,28 @@
       "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz",
       "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ=="
     },
+    "unbzip2-stream": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.2.tgz",
+      "integrity": "sha512-pZMVAofMrrHX6Ik39hCk470kulCbmZ2SWfQLPmTWqfJV/oUm0gn1CblvHdUu4+54Je6Jq34x8kY6XjTy6dMkOg==",
+      "dev": true,
+      "requires": {
+        "buffer": "^5.2.1",
+        "through": "^2.3.8"
+      },
+      "dependencies": {
+        "buffer": {
+          "version": "5.6.0",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz",
+          "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==",
+          "dev": true,
+          "requires": {
+            "base64-js": "^1.0.2",
+            "ieee754": "^1.1.4"
+          }
+        }
+      }
+    },
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
@@ -13187,6 +14269,29 @@
         "requires-port": "^1.0.0"
       }
     },
+    "url-parse-lax": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
+      "dev": true,
+      "requires": {
+        "prepend-http": "^2.0.0"
+      },
+      "dependencies": {
+        "prepend-http": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+          "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
+          "dev": true
+        }
+      }
+    },
+    "url-to-options": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
+      "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=",
+      "dev": true
+    },
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
@@ -15255,6 +16360,16 @@
         "camelcase": "^5.0.0",
         "decamelize": "^1.2.0"
       }
+    },
+    "yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+      "dev": true,
+      "requires": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
     }
   }
 }
diff --git a/smart-hut/package.json b/smart-hut/package.json
index 502c36b..d6010d7 100644
--- a/smart-hut/package.json
+++ b/smart-hut/package.json
@@ -13,13 +13,16 @@
     "classnames": "^2.2.6",
     "immutability-helper": "^3.0.2",
     "material-ui-image": "^3.2.3",
+    "rc-slider": "^9.2.4",
     "react": "^16.12.0",
     "react-axios": "^2.0.3",
     "react-circular-input": "^0.1.6",
     "react-circular-slider-svg": "^0.1.5",
+    "react-confirm-alert": "^2.6.1",
     "react-device-detect": "^1.11.14",
     "react-dom": "^16.12.0",
     "react-modal": "^2.2.2",
+    "react-rangeslider": "^2.2.0",
     "react-redux": "^7.2.0",
     "react-round-slider": "^1.0.1",
     "react-router": "^5.1.2",
@@ -34,6 +37,9 @@
     "start": "react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test",
+    "eslint": "eslint src",
+    "eslint-fix": "eslint --fix src",
+    "eslint:report": "eslint src -f json -o eslint-report.json",
     "eject": "react-scripts eject"
   },
   "eslintConfig": {
@@ -52,6 +58,9 @@
     ]
   },
   "devDependencies": {
-    "prettier": "2.0.1"
+    "prettier": "2.0.1",
+    "sonarqube-scanner": "^2.6.0",
+    "eslint-config-airbnb": "^18.1.0",
+    "eslint-plugin-chai-friendly": "^0.6.0"
   }
 }
diff --git a/smart-hut/public/img/camera-icon-simulation.png b/smart-hut/public/img/camera-icon-simulation.png
new file mode 100644
index 0000000..ebc169c
Binary files /dev/null and b/smart-hut/public/img/camera-icon-simulation.png differ
diff --git a/smart-hut/public/img/curtains-icon.png b/smart-hut/public/img/curtains-icon.png
new file mode 100644
index 0000000..2772356
Binary files /dev/null and b/smart-hut/public/img/curtains-icon.png differ
diff --git a/smart-hut/public/img/humidity-simulation.png b/smart-hut/public/img/humidity-simulation.png
new file mode 100644
index 0000000..fc2e758
Binary files /dev/null and b/smart-hut/public/img/humidity-simulation.png differ
diff --git a/smart-hut/public/img/insensity-light-simulation.png b/smart-hut/public/img/insensity-light-simulation.png
new file mode 100644
index 0000000..b252bc7
Binary files /dev/null and b/smart-hut/public/img/insensity-light-simulation.png differ
diff --git a/smart-hut/public/img/intensity-icon-simulation-2.png b/smart-hut/public/img/intensity-icon-simulation-2.png
new file mode 100644
index 0000000..347fd79
Binary files /dev/null and b/smart-hut/public/img/intensity-icon-simulation-2.png differ
diff --git a/smart-hut/public/img/light-simulation.png b/smart-hut/public/img/light-simulation.png
new file mode 100644
index 0000000..744aeb0
Binary files /dev/null and b/smart-hut/public/img/light-simulation.png differ
diff --git a/smart-hut/public/img/motion-simulation.png b/smart-hut/public/img/motion-simulation.png
new file mode 100644
index 0000000..5f0dcb3
Binary files /dev/null and b/smart-hut/public/img/motion-simulation.png differ
diff --git a/smart-hut/public/img/security-icon.png b/smart-hut/public/img/security-icon.png
new file mode 100644
index 0000000..652ce35
Binary files /dev/null and b/smart-hut/public/img/security-icon.png differ
diff --git a/smart-hut/public/img/thermo-simulation.png b/smart-hut/public/img/thermo-simulation.png
new file mode 100644
index 0000000..08d9bb6
Binary files /dev/null and b/smart-hut/public/img/thermo-simulation.png differ
diff --git a/smart-hut/public/img/thermostat-icon.png b/smart-hut/public/img/thermostat-icon.png
new file mode 100644
index 0000000..9f64146
Binary files /dev/null and b/smart-hut/public/img/thermostat-icon.png differ
diff --git a/smart-hut/src/App.js b/smart-hut/src/App.js
index 602e77f..fa6403d 100644
--- a/smart-hut/src/App.js
+++ b/smart-hut/src/App.js
@@ -1,28 +1,29 @@
-import React, { Component } from "react";
-import { BrowserRouter, Switch, Route, Redirect } from "react-router-dom";
-import Home from "./views/Home";
-import Dashboard from "./views/Dashboard";
-import Signup from "./views/Signup";
-import Login from "./views/Login";
-import FourOhFour from "./views/FourOhFour";
-import ForgotPass from "./views/Forgot-password";
-import ChangePass from "./views/Forgot-pass-reset";
-import ConfirmForgotPasswrod from "./views/ConfirmForgotPassword";
-import ConfirmRegistration from "./views/ConfirmRegistration";
-import ConfirmResetPassword from "./views/ConfirmResetPassword";
-import Instruction from "./views/Instruction";
-import Videocam from "./views/Videocam";
-import queryString from "query-string";
-import { RemoteService } from "./remote";
-import { connect } from "react-redux";
+import React, { Component } from 'react';
+import {
+ BrowserRouter, Switch, Route, Redirect,
+} from 'react-router-dom';
+import queryString from 'query-string';
+import { connect } from 'react-redux';
+import Home from './views/Home';
+import Dashboard from './views/Dashboard';
+import Signup from './views/Signup';
+import Login from './views/Login';
+import FourOhFour from './views/FourOhFour';
+import ForgotPass from './views/Forgot-password';
+import ConfirmForgotPasswrod from './views/ConfirmForgotPassword';
+import ConfirmRegistration from './views/ConfirmRegistration';
+import ConfirmResetPassword from './views/ConfirmResetPassword';
+import Instruction from './views/Instruction';
+import Videocam from './views/Videocam';
+import { RemoteService } from './remote';
 
 class App extends Component {
   constructor(props, context) {
     super(props, context);
 
     this.state = {
-      query: "",
-      info: "",
+      query: '',
+      info: '',
     };
   }
 
@@ -36,7 +37,7 @@ class App extends Component {
   }
 
   render() {
-    console.log("rendering root", this.props.loggedIn, this.state.query);
+    console.log('rendering root', this.props.loggedIn, this.state.query);
     return (
       <BrowserRouter>
         <Switch>
@@ -49,7 +50,7 @@ class App extends Component {
             {this.props.loggedIn ? <Dashboard /> : <Redirect to="/login" />}
           </Route>
           <Route path="/forgot-password">
-            <ForgotPass />
+            <ForgotPass type="FPassword1" />
           </Route>
           <Route path="/sent-email">
             <ConfirmForgotPasswrod />
@@ -60,9 +61,11 @@ class App extends Component {
           <Route path="/instruction">
             <Instruction />
           </Route>
-          <Route path="/forgot-pass-reset"> </Route>
+          <Route path="/forgot-pass-reset">
+            <ForgotPass type="FPassword1" />
+          </Route>
           <Route path="/password-reset">
-            <ChangePass query={this.state.query} />
+            <ForgotPass type="FPassword2" query={this.state.query} />
           </Route>
           <Route path="/conf-reset-pass">
             <ConfirmResetPassword />
diff --git a/smart-hut/src/App.test.js b/smart-hut/src/App.test.js
index 135fe7a..3ff4d37 100644
--- a/smart-hut/src/App.test.js
+++ b/smart-hut/src/App.test.js
@@ -1,19 +1,19 @@
-import React from "react";
-import { render } from "@testing-library/react";
-import { Router } from "react-router";
-import { createMemoryHistory } from "history";
-import App from "./App";
-import { Provider } from "react-redux";
-import smartHutStore from "./store";
+import React from 'react';
+import { render } from '@testing-library/react';
+import { Router } from 'react-router';
+import { createMemoryHistory } from 'history';
+import { Provider } from 'react-redux';
+import App from './App';
+import smartHutStore from './store';
 
-test("redirects to homepage", () => {
+test('redirects to homepage', () => {
   const history = createMemoryHistory();
   render(
     <Router history={history}>
       <Provider store={smartHutStore}>
         <App />
       </Provider>
-    </Router>
+    </Router>,
   );
-  expect(history.location.pathname).toBe("/");
+  expect(history.location.pathname).toBe('/');
 });
diff --git a/smart-hut/src/components/AutomationModal.js b/smart-hut/src/components/AutomationModal.js
deleted file mode 100644
index 5f8fbd5..0000000
--- a/smart-hut/src/components/AutomationModal.js
+++ /dev/null
@@ -1,189 +0,0 @@
-import React, { Component } from "react";
-import { connect } from "react-redux";
-import { RemoteService } from "../remote";
-import { appActions } from "../storeActions";
-
-class AutomationModal extends Component {
-  constructor(props) {
-    super(props);
-    this.state = this.initialState;
-    this.setInitialState();
-
-    this.addAutomationModal = this.addAutomationModal.bind(this);
-    this.modifyAutomationModal = this.modifyAutomationModal.bind(this);
-    this.deleteAutomation = this.deleteAutomation.bind(this);
-  }
-
-  get initialState() {
-    return {
-      //INITIAL STATE HERE
-    };
-  }
-
-  setInitialState() {
-    this.setState(this.initialState);
-  }
-
-  get type() {
-    return !this.props.id ? "new" : "modify";
-  }
-
-  addAutomationModal = (e) => {
-    /*let data = {
-      // DATA HERE
-    };*/
-    // TODO CALL TO REMOTE SERVER TO ADD SCENE
-    /*this.props
-      .saveRoom(data, null)
-      .then(() => {
-        this.setInitialState();
-        this.closeModal();
-      })
-      .catch((err) => console.error("error in creating room", err));*/
-  };
-
-  modifyAutomationModal = (e) => {
-    /* let data = {
-      // DATA HERE
-    };*/
-    // TODO CALL TO REMOTE SERVER TO MODIFY SCENE
-    /*this.props
-      .saveRoom(data, this.props.id)
-      .then(() => {
-        this.setInitialState();
-        this.closeModal();
-      })
-      .catch((err) => console.error("error in updating room", err));*/
-  };
-
-  deleteAutomation = (e) => {
-    // TODO CALL TO REMOTE SERVER TO DELETE SCENE
-    /*
-    this.props
-      .deleteRoom(this.props.id)
-      .then(() => this.closeModal())
-      .catch((err) => console.error("error in deleting room", err));*/
-  };
-
-  changeSomething = (event) => {
-    let nam = event.target.name;
-    let val = event.target.value;
-    this.setState({ [nam]: val });
-  };
-
-  closeModal = (e) => {
-    this.setState({ openModal: false });
-  };
-
-  openModal = (e) => {
-    this.setState({ openModal: true });
-  };
-
-  render() {
-    return (
-      <div>
-        {/*
-        {!this.props.nicolaStop ? (
-          <div>
-            <Responsive minWidth={768}>
-              {this.type === "new" ? (
-                <Button
-                  icon
-                  labelPosition="left"
-                  inverted
-                  onClick={this.openModal}
-                >
-                  <Icon name="plus" size="small" />
-                  ADD AUTOMATION
-                </Button>
-              ) : (
-                <Icon name="pencil" size="small" onClick={this.openModal} />
-              )}
-            </Responsive>
-            <Responsive maxWidth={768}>
-              {this.type === "new" ? (
-                <Button
-                  icon
-                  fluid
-                  labelPosition="left"
-                  onClick={this.openModal}
-                >
-                  <Icon name="plus" size="small" />
-                  ADD AUTOMATION
-                </Button>
-              ) : (
-                <Button
-                  icon
-                  fluid
-                  labelPosition="left"
-                  onClick={this.openModal}
-                >
-                  <Icon name="pencil" size="small" />
-                  EDIT AUTOMATION
-                </Button>
-              )}
-            </Responsive>
-          </div>
-        ) : null}
-
-        <Modal closeIcon onClose={this.closeModal} open={this.state.openModal}>
-          <Header>
-            {this.type === "new" ? "Add new automation" : "Modify automation"}
-          </Header>
-          <Modal.Content>
-            {
-              //TODO FORM TO ADD OR MODIFY SCENE
-            }
-
-            {this.type === "modify" ? (
-              <Button
-                icon
-                labelPosition="left"
-                inverted
-                color="red"
-                onClick={this.deleteAutomation}
-              >
-                <Icon name="trash alternate" />
-                Delete Automation
-              </Button>
-            ) : null}
-          </Modal.Content>
-          <Modal.Actions>
-            <Button color="red" onClick={this.closeModal}>
-              <Icon name="remove" />{" "}
-              {this.type === "new" ? "Cancel" : "Discard changes"}
-            </Button>
-
-            <Button
-              color="green"
-              onClick={
-                this.type === "new"
-                  ? this.addAutomationModal
-                  : this.modifyAutomationModal
-              }
-            >
-              <Icon name="checkmark" />{" "}
-              {this.type === "new" ? "Add automation" : "Save changes"}
-            </Button>
-          </Modal.Actions>
-        </Modal>*/}
-      </div>
-    );
-  }
-}
-
-const setActiveAutomation = (activeAutomation) => {
-  return (dispatch) =>
-    dispatch(appActions.setActiveAutomation(activeAutomation));
-};
-
-const mapStateToProps = (state, ownProps) => ({
-  automations: ownProps.id ? state.automations[ownProps.id] : null,
-});
-const AutomationModalContainer = connect(
-  mapStateToProps,
-  { ...RemoteService, setActiveAutomation },
-  null,
-  { forwardRef: true }
-)(AutomationModal);
-export default AutomationModalContainer;
diff --git a/smart-hut/src/components/Banner.js b/smart-hut/src/components/Banner.js
index 5ff1efd..0cd88bb 100644
--- a/smart-hut/src/components/Banner.js
+++ b/smart-hut/src/components/Banner.js
@@ -1,34 +1,34 @@
-import React from "react";
-import PropTypes from "prop-types";
-import { makeStyles } from "@material-ui/core/styles";
-import Paper from "@material-ui/core/Paper";
-import Typography from "@material-ui/core/Typography";
-import Grid from "@material-ui/core/Grid";
-import Link from "@material-ui/core/Link";
+import React from 'react';
+import PropTypes from 'prop-types';
+import { makeStyles } from '@material-ui/core/styles';
+import Paper from '@material-ui/core/Paper';
+import Typography from '@material-ui/core/Typography';
+import Grid from '@material-ui/core/Grid';
+import Link from '@material-ui/core/Link';
 
 const useStyles = makeStyles((theme) => ({
   mainFeaturedPost: {
-    position: "relative",
+    position: 'relative',
     backgroundColor: theme.palette.grey[800],
     color: theme.palette.common.white,
     marginBottom: theme.spacing(4),
-    backgroundImage: "img/banner.jpg",
-    backgroundSize: "cover",
-    backgroundRepeat: "no-repeat",
-    backgroundPosition: "center",
+    backgroundImage: 'img/banner.jpg',
+    backgroundSize: 'cover',
+    backgroundRepeat: 'no-repeat',
+    backgroundPosition: 'center',
   },
   overlay: {
-    position: "absolute",
+    position: 'absolute',
     top: 0,
     bottom: 0,
     right: 0,
     left: 0,
-    backgroundColor: "rgba(0,0,0,.3)",
+    backgroundColor: 'rgba(0,0,0,.3)',
   },
   mainFeaturedPostContent: {
-    position: "relative",
+    position: 'relative',
     padding: theme.spacing(3),
-    [theme.breakpoints.up("md")]: {
+    [theme.breakpoints.up('md')]: {
       padding: theme.spacing(6),
       paddingRight: 0,
     },
@@ -47,7 +47,7 @@ export default function Banner(props) {
       {/* Increase the priority of the hero background image */}
       {
         <img
-          style={{ display: "none" }}
+          style={{ display: 'none' }}
           src={post.image}
           alt={post.imageText}
         />
diff --git a/smart-hut/src/components/DropdownSimulation.js b/smart-hut/src/components/DropdownSimulation.js
new file mode 100644
index 0000000..853f441
--- /dev/null
+++ b/smart-hut/src/components/DropdownSimulation.js
@@ -0,0 +1,15 @@
+import React from 'react';
+import { Dropdown } from 'semantic-ui-react';
+
+const options = [
+    { key: 'Living Room', text: 'Living Room', value: 'Living Room' },
+    { key: 'Kitchen', text: 'Kitchen', value: 'Kitchen' },
+    { key: 'Garden', text: 'Garden', value: 'Garden' },
+    { key: 'Bedroom 1', text: 'Bedroom 1', value: 'Bedroom 1' },
+];
+
+const DropdownSimulation = () => (
+  <Dropdown placeholder="Skills" fluid multiple selection options={options} />
+);
+
+export default DropdownSimulation;
diff --git a/smart-hut/src/components/FilterDevices.js b/smart-hut/src/components/FilterDevices.js
deleted file mode 100644
index bc241b1..0000000
--- a/smart-hut/src/components/FilterDevices.js
+++ /dev/null
@@ -1,82 +0,0 @@
-import { Dropdown } from "semantic-ui-react";
-import React, { Component } from "react";
-
-export default class FilterDevices extends Component {
-  render() {
-    const tagOptions = [
-      {
-        key: "regularLight",
-        text: "regularLight",
-        value: "regularLight",
-        label: { color: "red", empty: true, circular: true },
-      },
-      {
-        key: "dimmableLight",
-        text: "dimmableLight",
-        value: "dimmableLight",
-        label: { color: "blue", empty: true, circular: true },
-      },
-      {
-        key: "buttonDimmer",
-        text: "buttonDimmer",
-        value: "buttonDimmer",
-        label: { color: "black", empty: true, circular: true },
-      },
-      {
-        key: "knobDimmer",
-        text: "knobDimmer",
-        value: "knobDimmer",
-        label: { color: "purple", empty: true, circular: true },
-      },
-      {
-        key: "motionSensor",
-        text: "motionSensor",
-        value: "motionSensor",
-        label: { color: "orange", empty: true, circular: true },
-      },
-      {
-        key: "sensor",
-        text: "sensor",
-        value: "sensor",
-        label: { empty: true, circular: true },
-      },
-      {
-        key: "smartPlug",
-        text: "smartPlug",
-        value: "smartPlug",
-        label: { color: "pink", empty: true, circular: true },
-      },
-      {
-        key: "switch",
-        text: "switch",
-        value: "switch",
-        label: { color: "green", empty: true, circular: true },
-      },
-    ];
-
-    return (
-      <Dropdown
-        text="Filter Devices"
-        icon="filter"
-        floating
-        labeled
-        button
-        className="icon"
-      >
-        <Dropdown.Menu>
-          <Dropdown.Divider />
-          <Dropdown.Header icon="tags" content="Tag Device" />
-          <Dropdown.Menu scrolling>
-            {tagOptions.map((option) => (
-              <Dropdown.Item
-                key={option.value}
-                {...option}
-                onClick={this.props.filterDevices}
-              />
-            ))}
-          </Dropdown.Menu>
-        </Dropdown.Menu>
-      </Dropdown>
-    );
-  }
-}
diff --git a/smart-hut/src/components/Footer.js b/smart-hut/src/components/Footer.js
index acf9ebb..e0a34fc 100644
--- a/smart-hut/src/components/Footer.js
+++ b/smart-hut/src/components/Footer.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React from 'react';
 
 export default function Footer() {
   return (
diff --git a/smart-hut/src/components/Header.js b/smart-hut/src/components/Header.js
index b9bde06..0b789ed 100644
--- a/smart-hut/src/components/Header.js
+++ b/smart-hut/src/components/Header.js
@@ -1,12 +1,12 @@
-import React from "react";
-import PropTypes from "prop-types";
-import { makeStyles } from "@material-ui/core/styles";
-import Toolbar from "@material-ui/core/Toolbar";
-import Button from "@material-ui/core/Button";
-import IconButton from "@material-ui/core/IconButton";
-import SearchIcon from "@material-ui/icons/Search";
-import Typography from "@material-ui/core/Typography";
-import Link from "@material-ui/core/Link";
+import React from 'react';
+import PropTypes from 'prop-types';
+import { makeStyles } from '@material-ui/core/styles';
+import Toolbar from '@material-ui/core/Toolbar';
+import Button from '@material-ui/core/Button';
+import IconButton from '@material-ui/core/IconButton';
+import SearchIcon from '@material-ui/icons/Search';
+import Typography from '@material-ui/core/Typography';
+import Link from '@material-ui/core/Link';
 
 const useStyles = makeStyles((theme) => ({
   toolbar: {
@@ -16,8 +16,8 @@ const useStyles = makeStyles((theme) => ({
     flex: 1,
   },
   toolbarSecondary: {
-    justifyContent: "space-between",
-    overflowX: "auto",
+    justifyContent: 'space-between',
+    overflowX: 'auto',
   },
   toolbarLink: {
     padding: theme.spacing(1),
@@ -30,7 +30,7 @@ export default function Header(props) {
   const { sections, title } = props;
 
   return (
-    <React.Fragment>
+    <>
       <Toolbar className={classes.toolbar}>
         <Typography
           component="h2"
@@ -60,7 +60,7 @@ export default function Header(props) {
             </Link>
           ))}
         </Toolbar>
-        <Button size="small" variant="outlined" style={{ margin: "0 1rem" }}>
+        <Button size="small" variant="outlined" style={{ margin: '0 1rem' }}>
           Login
         </Button>
 
@@ -68,7 +68,7 @@ export default function Header(props) {
           Sign up
         </Button>
       </Toolbar>
-    </React.Fragment>
+    </>
   );
 }
 
diff --git a/smart-hut/src/components/HeaderController.js b/smart-hut/src/components/HeaderController.js
index 1d84c6b..e3ff71d 100644
--- a/smart-hut/src/components/HeaderController.js
+++ b/smart-hut/src/components/HeaderController.js
@@ -1,14 +1,22 @@
-import React from "react";
-import { Grid, Divider, Button, Label, Responsive } from "semantic-ui-react";
-import { Segment, Image } from "semantic-ui-react";
-import { RemoteService } from "../remote";
-import { withRouter } from "react-router-dom";
-import { connect } from "react-redux";
+import React from 'react';
+import {
+  Grid,
+  Divider,
+  Button,
+  Label,
+  Responsive,
+  Checkbox,
+ Segment, Image,
+} from 'semantic-ui-react';
+import { withRouter } from 'react-router-dom';
+import { connect } from 'react-redux';
+import { RemoteService } from '../remote';
+import SimulationPanel from './SimulationPanel';
 
 const IconHomeImage = () => (
   <Image
     src="smart-home.png"
-    style={{ width: "50px", height: "auto" }}
+    style={{ width: '50px', height: 'auto' }}
     centered
     as="a"
     href="/"
@@ -17,41 +25,72 @@ const IconHomeImage = () => (
 
 const TitleImage = () => <Image src="sm_logo.png" size="medium" centered />;
 
-export class MyHeader extends React.Component {
+class MyHeader extends React.Component {
   constructor(props) {
     super(props);
-
+    this.state = { simulationPanel: undefined };
     this.getInfo();
     this.logout = this.logout.bind(this);
   }
 
   logout() {
-    this.props.logout().then(() => this.props.history.push("/"));
+    this.props.logout().then(() => this.props.history.push('/'));
   }
 
   getInfo() {
     this.props
       .fetchUserInfo()
-      .catch((err) => console.error("MyHeader fetch user info error", err));
+      .catch((err) => console.error('MyHeader fetch user info error', err));
   }
 
+  setCameraEnabled(val) {
+    const enabled = {
+      cameraEnabled: val,
+    };
+    this.props
+      .userPermissions(enabled)
+      .then(() => this.getInfo())
+      .catch((err) => console.error('Camera enabled', err));
+  }
+
+  openSimulationPanel = () => {
+    this.setState((state) => ({ simulationPanel: true }));
+  };
+
+  closeSimulationPanel = () => {
+    this.setState((state) => ({ simulationPanel: undefined }));
+  };
+
+
   render() {
     return (
       <div>
+        <SimulationPanel
+          simulationPanel={this.state.simulationPanel}
+          closeSimulationPanel={this.closeSimulationPanel}
+        />
         <Responsive minWidth={768}>
-          <Grid columns="equal" divided inverted padded>
+          <Grid verticalAlign="middle" columns="equal" divided inverted padded>
             <Grid.Row color="black" textAlign="center">
-              <Grid.Column width={3} height={0.5}>
-                <Segment color="black" inverted>
-                  <IconHomeImage />
-                </Segment>
+              <Grid.Column width={4} height={0.5}>
+                <Grid.Row>
+                  <Segment color="black" inverted>
+                    <IconHomeImage />
+                  </Segment>
+                </Grid.Row>
+                <Divider />
+                <Grid.Row>
+                  <Button basic inverted onClick={this.openSimulationPanel}>
+                  Simulation Panel
+                  </Button>
+                </Grid.Row>
               </Grid.Column>
               <Grid.Column>
                 <Segment color="black" inverted>
                   <TitleImage />
                 </Segment>
               </Grid.Column>
-              <Grid.Column width={2} heigth={1}>
+              <Grid.Column width={4} heigth={1}>
                 <Label as="a" image color="black">
                   <img alt="SmartHut logo" src="smart-home.png" />
                   {this.props.username}
@@ -60,6 +99,23 @@ export class MyHeader extends React.Component {
                 <Button basic inverted onClick={this.logout}>
                   Logout
                 </Button>
+                <Divider />
+                <Segment
+                  color="grey"
+                  inverted
+                  compact
+                  style={{
+                    margin: 'auto',
+                    marginTop: '1em',
+                    textAlign: 'center',
+                  }}
+                >
+                  <Checkbox
+                    label={<label>Share cameras</label>}
+                    checked={this.props.cameraEnabled}
+                    onChange={(e, val) => this.setCameraEnabled(val.checked)}
+                  />
+                </Segment>
               </Grid.Column>
             </Grid.Row>
           </Grid>
@@ -73,15 +129,43 @@ export class MyHeader extends React.Component {
             </Grid.Row>
             <Grid.Row color="black" textAlign="center">
               <Grid.Column>
-                <IconHomeImage />
-              </Grid.Column>
-              <Grid.Column>
-                <Label as="a" image color="black">
-                  <img alt="SmartHut logo" src="smart-home.png" />
-                  {this.props.username}
-                </Label>
+                <Grid.Row>
+                  <IconHomeImage />
+                </Grid.Row>
                 <Divider />
-                <Button onClick={this.logout}>Logout</Button>
+                <Grid.Row>
+                  <Button onClick={this.openSimulationPanel}>
+                  Simulation Panel
+                  </Button>
+                </Grid.Row>
+              </Grid.Column>
+              <Divider />
+              <Grid.Column>
+                <Grid.Column width={4} heigth={1}>
+                  <Label as="a" image color="black">
+                    <img alt="SmartHut logo" src="smart-home.png" />
+                    {this.props.username}
+                  </Label>
+                  <Divider />
+                  <Button basic inverted onClick={this.logout}>
+                  Logout
+                  </Button>
+                  <Divider />
+                  <Segment
+                    compact
+                    style={{
+                    margin: 'auto',
+                    marginTop: '1em',
+                    textAlign: 'center',
+                  }}
+                  >
+                    <Checkbox
+                      label={<label>Share cameras</label>}
+                      checked={this.props.cameraEnabled}
+                      onChange={(e, val) => this.setCameraEnabled(val.checked)}
+                    />
+                  </Segment>
+                </Grid.Column>
               </Grid.Column>
             </Grid.Row>
           </Grid>
@@ -93,10 +177,11 @@ export class MyHeader extends React.Component {
 
 const mapStateToProps = (state, _) => ({
   username:
-    state.userInfo && state.userInfo.username ? state.userInfo.username : "",
+    state.userInfo && state.userInfo.username ? state.userInfo.username : '',
+  cameraEnabled: state.userInfo ? state.userInfo.cameraEnabled : false,
 });
 const LoginContainer = connect(
   mapStateToProps,
-  RemoteService
+  RemoteService,
 )(withRouter(MyHeader));
 export default LoginContainer;
diff --git a/smart-hut/src/components/HomeNavbar.js b/smart-hut/src/components/HomeNavbar.js
index 401cf72..8aa4cd4 100644
--- a/smart-hut/src/components/HomeNavbar.js
+++ b/smart-hut/src/components/HomeNavbar.js
@@ -1,5 +1,5 @@
-import _ from "lodash";
-import React, { Component } from "react";
+import _ from 'lodash';
+import React, { Component } from 'react';
 import {
   Container,
   Icon,
@@ -7,7 +7,7 @@ import {
   Menu,
   Sidebar,
   Responsive,
-} from "semantic-ui-react";
+} from 'semantic-ui-react';
 
 const NavBarMobile = ({
   children,
@@ -30,7 +30,7 @@ const NavBarMobile = ({
     <Sidebar.Pusher
       dimmed={visible}
       onClick={onPusherClick}
-      style={{ minHeight: "100vh" }}
+      style={{ minHeight: '100vh' }}
     >
       <Menu fixed="top" inverted>
         <Menu.Item>
@@ -67,7 +67,7 @@ const NavBarDesktop = ({ leftItems, rightItems }) => (
 );
 
 const NavBarChildren = ({ children }) => (
-  <Container style={{ marginTop: "5em" }}>{children}</Container>
+  <Container style={{ marginTop: '5em' }}>{children}</Container>
 );
 
 class HomeNavabarApp extends Component {
@@ -75,10 +75,11 @@ class HomeNavabarApp extends Component {
     super(props);
     this.state = {
       logged: true,
-      email: "",
-      password: "",
+      email: '',
+      password: '',
     };
   }
+
   state = {
     visible: false,
   };
@@ -117,17 +118,23 @@ class HomeNavabarApp extends Component {
   }
 }
 
-const leftItems = [{ as: "a", content: "Home", key: "home", href: "/" }];
+const leftItems = [{
+ as: 'a', content: 'Home', key: 'home', href: '/',
+}];
 const rightItems = [
-  { as: "a", content: "Login", key: "login", href: "/login" },
-  { as: "a", content: "Sign up", key: "register", href: "/signup" },
+  {
+ as: 'a', content: 'Login', key: 'login', href: '/login',
+},
+  {
+ as: 'a', content: 'Sign up', key: 'register', href: '/signup',
+},
 ];
 
 const HomeNavbarApp = () => (
   <HomeNavabarApp
     leftItems={leftItems}
     rightItems={rightItems}
-  ></HomeNavabarApp>
+  />
 );
 
 export default HomeNavbarApp;
diff --git a/smart-hut/src/components/HostModal.js b/smart-hut/src/components/HostModal.js
new file mode 100644
index 0000000..5d890a3
--- /dev/null
+++ b/smart-hut/src/components/HostModal.js
@@ -0,0 +1,134 @@
+import React, { Component } from 'react';
+import {
+  Button,
+  Header,
+  Modal,
+  Icon,
+  Form,
+  Responsive,
+  Dropdown,
+} from 'semantic-ui-react';
+import { connect } from 'react-redux';
+import { RemoteService, Forms } from '../remote';
+import { appActions } from '../storeActions';
+
+class HostModal extends Component {
+  constructor(props) {
+    super(props);
+    this.state = { guests: [], users: [] };
+
+    this.props
+      .fetchGuests()
+      .then(() => {
+        this.setState({
+          ...this.state,
+          guests: this.props.guests.map((u) => u.id),
+        });
+      })
+      .catch(console.error);
+
+    Forms.fetchAllUsers()
+      .then((users) => this.setState({
+          ...this.state,
+          users: users
+            .filter((u) => u.id !== this.props.currentUserId)
+            .map((u) => ({
+              key: u.id,
+              text: `@${u.username} (${u.name})`,
+              value: u.id,
+            })),
+        }))
+      .catch(console.error);
+
+    this.saveGuestSettings = this.saveGuestSettings.bind(this);
+    this.closeModal = this.closeModal.bind(this);
+    this.openModal = this.openModal.bind(this);
+    this.setGuests = this.setGuests.bind(this);
+    this.saveGuestSettings = this.saveGuestSettings.bind(this);
+  }
+
+  setGuests(_, guests) {
+    this.setState({ guests: guests.value });
+  }
+
+  closeModal() {
+    this.setState({ openModal: false });
+  }
+
+  openModal() {
+    this.setState({ openModal: true });
+  }
+
+  saveGuestSettings() {
+    this.props
+      .updateGuests(this.state.guests)
+      .then(this.closeModal)
+      .catch(console.error);
+  }
+
+  render() {
+    return (
+      <>
+        <Responsive minWidth={768}>
+          <Button icon labelPosition="left" inverted onClick={this.openModal}>
+            <Icon name="plus" size="small" />
+            Invitation settings
+          </Button>
+        </Responsive>
+        <Responsive maxWidth={768}>
+          <Button icon fluid labelPosition="left" onClick={this.openModal}>
+            <Icon name="plus" size="small" />
+            Invitation settings
+          </Button>
+        </Responsive>
+
+        <Modal closeIcon onClose={this.closeModal} open={this.state.openModal}>
+          <Header>Select guests</Header>
+          <Modal.Content>
+            <Form>
+              <Form.Field style={{ marginTop: '1rem' }}>
+                <label>Select which users are your guests: </label>
+                <Dropdown
+                  name="guests"
+                  placeholder="Select Guests"
+                  fluid
+                  multiple
+                  onChange={this.setGuests}
+                  options={this.state.users}
+                  value={this.state.guests}
+                />
+              </Form.Field>
+            </Form>
+          </Modal.Content>
+          <Modal.Actions>
+            <Button color="red" onClick={this.closeModal}>
+              <Icon name="remove" />
+              {' '}
+Discard changes
+            </Button>
+
+            <Button color="green" onClick={this.saveGuestSettings}>
+              <Icon name="checkmark" />
+              {' '}
+Save changes
+            </Button>
+          </Modal.Actions>
+        </Modal>
+      </>
+    );
+  }
+}
+
+const setActiveHost = (activeHost) => (dispatch) => dispatch(appActions.setActiveHost(activeHost));
+
+const mapStateToProps = (state) => ({
+  guests: state.guests,
+  currentUserId: state.userInfo.id,
+});
+const HostModalContainer = connect(
+  mapStateToProps,
+  { ...RemoteService, setActiveHost },
+  null,
+  { forwardRef: true },
+)(HostModal);
+export default HostModalContainer;
diff --git a/smart-hut/src/components/RoomModal.js b/smart-hut/src/components/RoomModal.js
index eabdb89..e8e60f0 100644
--- a/smart-hut/src/components/RoomModal.js
+++ b/smart-hut/src/components/RoomModal.js
@@ -1,4 +1,4 @@
-import React, { Component } from "react";
+import React, { Component } from 'react';
 import {
   Button,
   Header,
@@ -8,56 +8,52 @@ import {
   Icon,
   Responsive,
   Image,
-} from "semantic-ui-react";
-import SelectIcons from "./SelectIcons";
-import { connect } from "react-redux";
-import { RemoteService } from "../remote";
-import { appActions } from "../storeActions";
-import { update } from "immutability-helper";
+  Confirm,
+} from 'semantic-ui-react';
+import { connect } from 'react-redux';
+import SelectIcons from './SelectIcons';
+import { RemoteService } from '../remote';
+import { appActions } from '../storeActions';
 
-const NO_IMAGE = "https://react.semantic-ui.com/images/wireframe/image.png";
+const NO_IMAGE = 'https://react.semantic-ui.com/images/wireframe/image.png';
 
 class RoomModal extends Component {
   constructor(props) {
     super(props);
     this.state = this.initialState;
-    this.setInitialState();
 
     this.fileInputRef = React.createRef();
 
     this.addRoomModal = this.addRoomModal.bind(this);
     this.updateIcon = this.updateIcon.bind(this);
-    this.removeImage = this.removeImage.bind(this);
+    this.unsetImage = this.unsetImage.bind(this);
   }
 
   get initialState() {
     return {
-      selectedIcon: this.type === "new" ? "home" : this.props.room.icon,
-      name: this.type === "new" ? "New Room" : this.props.room.name,
-      img: this.type === "new" ? null : this.props.room.image,
+      selectedIcon: this.type === 'new' ? 'home' : this.props.room.icon,
+      name: this.type === 'new' ? 'New Room' : this.props.room.name,
+      img: this.type === 'new' ? null : this.props.room.image,
       openModal: false,
+      sure: false,
     };
   }
 
-  removeImage(e) {
+  unsetImage = (e) => {
     e.preventDefault();
-    this.setState(
-      update(this.state, {
-        image: { $set: null },
-      })
-    );
-  }
+    this.setState({ ...this.state, img: '' });
+  };
 
   setInitialState() {
     this.setState(this.initialState);
   }
 
   get type() {
-    return !this.props.id ? "new" : "modify";
+    return !this.props.id ? 'new' : 'modify';
   }
 
   addRoomModal = (e) => {
-    let data = {
+    const data = {
       icon: this.state.selectedIcon,
       name: this.state.name,
       image: this.state.img,
@@ -69,17 +65,17 @@ class RoomModal extends Component {
         this.setInitialState();
         this.closeModal();
       })
-      .catch((err) => console.error("error in creating room", err));
+      .catch((err) => console.error('error in creating room', err));
   };
 
   modifyRoomModal = (e) => {
-    let data = {
+    const data = {
       icon: this.state.selectedIcon,
       name: this.state.name,
       image: this.state.img,
     };
 
-    console.log("data", data);
+    console.log('data', data);
 
     this.props
       .saveRoom(data, this.props.id)
@@ -87,19 +83,27 @@ class RoomModal extends Component {
         this.setInitialState();
         this.closeModal();
       })
-      .catch((err) => console.error("error in updating room", err));
+      .catch((err) => console.error('error in updating room', err));
   };
 
   deleteRoom = (e) => {
     this.props
       .deleteRoom(this.props.id)
       .then(() => this.closeModal())
-      .catch((err) => console.error("error in deleting room", err));
+      .catch((err) => console.error('error in deleting room', err));
+  };
+
+  setSureTrue = () => {
+    this.setState({ sure: true });
+  };
+
+  setSureFalse = () => {
+    this.setState({ sure: false });
   };
 
   changeSomething = (event) => {
-    let nam = event.target.name;
-    let val = event.target.value;
+    const nam = event.target.name;
+    const val = event.target.value;
     this.setState({ [nam]: val });
   };
 
@@ -116,7 +120,7 @@ class RoomModal extends Component {
   }
 
   getBase64(file, callback) {
-    let reader = new FileReader();
+    const reader = new FileReader();
     reader.readAsDataURL(file.target.files[0]);
     reader.onload = () => {
       this.setState(Object.assign(this.state, { img: reader.result }));
@@ -126,16 +130,16 @@ class RoomModal extends Component {
 
   render() {
     const spaceDiv = {
-      background: "#f4f4f4",
-      padding: "10px 10px",
-      margin: "10px 0px",
+      background: '#f4f4f4',
+      padding: '10px 10px',
+      margin: '10px 0px',
     };
     return (
       <div>
         {!this.props.nicolaStop ? (
           <div>
             <Responsive minWidth={768}>
-              {this.type === "new" ? (
+              {this.type === 'new' ? (
                 <Button
                   icon
                   labelPosition="left"
@@ -150,7 +154,7 @@ class RoomModal extends Component {
               )}
             </Responsive>
             <Responsive maxWidth={768}>
-              {this.type === "new" ? (
+              {this.type === 'new' ? (
                 <Button
                   icon
                   fluid
@@ -177,7 +181,7 @@ class RoomModal extends Component {
 
         <Modal closeIcon onClose={this.closeModal} open={this.state.openModal}>
           <Header>
-            {this.type === "new" ? "Add new room" : "Modify room"}
+            {this.type === 'new' ? 'Add new room' : 'Modify room'}
           </Header>
           <Modal.Content>
             <Form>
@@ -220,38 +224,48 @@ class RoomModal extends Component {
               <SelectIcons
                 updateIcon={this.updateIcon}
                 currentIcon={
-                  this.type === "new" ? "home" : this.props.room.icon
+                  this.type === 'new' ? 'home' : this.props.room.icon
                 }
               />
             </div>
 
-            {this.type === "modify" ? (
-              <Button
-                icon
-                labelPosition="left"
-                inverted
-                color="red"
-                onClick={this.deleteRoom}
-              >
-                <Icon name="trash alternate" />
-                Delete room
-              </Button>
+            {this.type === 'modify' ? (
+              <div>
+                <Button
+                  icon
+                  labelPosition="left"
+                  inverted
+                  color="red"
+                  onClick={this.setSureTrue}
+                >
+                  <Icon name="trash alternate" />
+                  Delete Room
+                  {' '}
+                </Button>
+                <Confirm
+                  open={this.state.sure}
+                  onCancel={this.setSureFalse}
+                  onConfirm={this.deleteRoom}
+                />
+              </div>
             ) : null}
           </Modal.Content>
           <Modal.Actions>
             <Button color="red" onClick={this.closeModal}>
-              <Icon name="remove" />{" "}
-              {this.type === "new" ? "Cancel" : "Discard changes"}
+              <Icon name="remove" />
+              {' '}
+              {this.type === 'new' ? 'Cancel' : 'Discard changes'}
             </Button>
 
             <Button
               color="green"
               onClick={
-                this.type === "new" ? this.addRoomModal : this.modifyRoomModal
+                this.type === 'new' ? this.addRoomModal : this.modifyRoomModal
               }
             >
-              <Icon name="checkmark" />{" "}
-              {this.type === "new" ? "Add room" : "Save changes"}
+              <Icon name="checkmark" />
+              {' '}
+              {this.type === 'new' ? 'Add room' : 'Save changes'}
             </Button>
           </Modal.Actions>
         </Modal>
@@ -260,9 +274,7 @@ class RoomModal extends Component {
   }
 }
 
-const setActiveRoom = (activeRoom) => {
-  return (dispatch) => dispatch(appActions.setActiveRoom(activeRoom));
-};
+const setActiveRoom = (activeRoom) => (dispatch) => dispatch(appActions.setActiveRoom(activeRoom));
 
 const mapStateToProps = (state, ownProps) => ({
   room: ownProps.id ? state.rooms[ownProps.id] : null,
@@ -271,6 +283,6 @@ const RoomModalContainer = connect(
   mapStateToProps,
   { ...RemoteService, setActiveRoom },
   null,
-  { forwardRef: true }
+  { forwardRef: true },
 )(RoomModal);
 export default RoomModalContainer;
diff --git a/smart-hut/src/components/SceneModal.js b/smart-hut/src/components/SceneModal.js
index 9183a58..0d3e9b7 100644
--- a/smart-hut/src/components/SceneModal.js
+++ b/smart-hut/src/components/SceneModal.js
@@ -1,4 +1,4 @@
-import React, { Component } from "react";
+import React, { Component } from 'react';
 import {
   Button,
   Header,
@@ -7,56 +7,87 @@ import {
   Responsive,
   Form,
   Input,
-} from "semantic-ui-react";
-import { connect } from "react-redux";
-import { RemoteService } from "../remote";
-import { appActions } from "../storeActions";
-//import { update } from "immutability-helper";
+  Dropdown,
+  Checkbox,
+  Segment,
+} from 'semantic-ui-react';
+import { connect } from 'react-redux';
+import SelectIcons from './SelectIcons';
+import { RemoteService } from '../remote';
+import { appActions } from '../storeActions';
+// import { update } from "immutability-helper";
 
 class SceneModal extends Component {
   constructor(props) {
     super(props);
     this.state = this.initialState;
-    this.setInitialState();
-
     this.addSceneModal = this.addSceneModal.bind(this);
     this.modifySceneModal = this.modifySceneModal.bind(this);
     this.deleteScene = this.deleteScene.bind(this);
+    this.updateIcon = this.updateIcon.bind(this);
+    this.setGuestAccessEnabled = this.setGuestAccessEnabled.bind(this);
+    this.setCopyFrom = this.setCopyFrom.bind(this);
+  }
+
+  componentDidUpdate(oldProps) {
+    // this might bug out since we are just checking the length
+    // to see if the elements inside this.props.scenes are changing
+    if (this.props.scenes.length !== oldProps.scenes.length) {
+      this.setState({ ...this.state, scenes: this.scenes });
+    }
   }
 
   get initialState() {
     return {
-      name: this.type === "new" ? "New Scene" : this.props.scene.name,
+      name: this.type === 'new' ? 'New Scene' : this.props.scene.name,
       openModal: false,
+      selectedIcon: 'home',
+      scenes: this.scenes,
+      copyFrom: null,
+      guestAccessEnabled:
+        this.type === 'new' ? null : this.props.scene.guestAccessEnabled,
     };
   }
 
+  get scenes() {
+    return this.props.scenes.map((s) => ({
+      key: s.id,
+      text: s.name,
+      value: s.id,
+    }));
+  }
+
   setInitialState() {
     this.setState(this.initialState);
   }
 
   get type() {
-    return !this.props.id ? "new" : "modify";
+    return !this.props.id ? 'new' : 'modify';
   }
 
   addSceneModal = (e) => {
-    let data = {
+    const data = {
       name: this.state.name,
+      icon: this.state.selectedIcon,
     };
 
     this.props
-      .saveScene(data, null)
+      .saveScene(data, null, this.state.copyFrom)
       .then(() => {
         this.setInitialState();
         this.closeModal();
       })
-      .catch((err) => console.error("error in creating room", err));
+      .catch((err) => console.error('error in creating room', err));
+      this.closeModal();
   };
 
   modifySceneModal = (e) => {
-    let data = {
+    const data = {
       name: this.state.name,
+      icon: this.state.selectedIcon,
+      guestAccessEnabled: this.state.guestAccessEnabled,
     };
+    console.log(data);
 
     this.props
       .saveScene(data, this.props.id)
@@ -64,37 +95,55 @@ class SceneModal extends Component {
         this.setInitialState();
         this.closeModal();
       })
-      .catch((err) => console.error("error in updating room", err));
+      .catch((err) => console.error('error in updating room', err));
   };
 
   deleteScene = (e) => {
     this.props
       .deleteScene(this.props.id)
       .then(() => this.closeModal())
-      .catch((err) => console.error("error in deleting room", err));
+      .catch((err) => console.error('error in deleting room', err));
   };
 
   changeSomething = (event) => {
-    let nam = event.target.name;
-    let val = event.target.value;
+    const nam = event.target.name;
+    const val = event.target.value;
     this.setState({ [nam]: val });
   };
 
   closeModal = (e) => {
-    this.setState({ openModal: false });
+    this.setState({ ...this.state, openModal: false });
   };
 
   openModal = (e) => {
-    this.setState({ openModal: true });
+    this.setState({ ...this.state, openModal: true });
   };
 
+  updateIcon(e) {
+    this.setState({ ...this.state, selectedIcon: e });
+  }
+
+  setCopyFrom(_, copyFrom) {
+    this.setState({ ...this.state, copyFrom: copyFrom.value });
+  }
+
+  setGuestAccessEnabled(val) {
+    console.log(this.state, val);
+    this.setState({ ...this.state, guestAccessEnabled: val });
+  }
+
   render() {
+    const spaceDiv = {
+      background: '#f4f4f4',
+      padding: '10px 10px',
+      margin: '10px 0px',
+    };
     return (
       <div>
         {!this.props.nicolaStop ? (
           <div>
             <Responsive minWidth={768}>
-              {this.type === "new" ? (
+              {this.type === 'new' ? (
                 <Button
                   icon
                   labelPosition="left"
@@ -109,7 +158,7 @@ class SceneModal extends Component {
               )}
             </Responsive>
             <Responsive maxWidth={768}>
-              {this.type === "new" ? (
+              {this.type === 'new' ? (
                 <Button
                   icon
                   fluid
@@ -136,13 +185,14 @@ class SceneModal extends Component {
 
         <Modal closeIcon onClose={this.closeModal} open={this.state.openModal}>
           <Header>
-            {this.type === "new" ? "Add new scene" : "Modify scene"}
+            {this.type === 'new' ? 'Add new scene' : 'Modify scene'}
           </Header>
           <Modal.Content>
             <Form>
               <p>Insert the name of the scene:</p>
               <Form.Field>
                 <Input
+                  required
                   label="Scene name"
                   placeholder="Scene Name"
                   name="name"
@@ -151,9 +201,43 @@ class SceneModal extends Component {
                   value={this.state.name}
                 />
               </Form.Field>
+              <div style={spaceDiv}>
+                <label>Icon:</label>
+                <SelectIcons
+                  updateIcon={this.updateIcon}
+                  currentIcon={
+                    this.type === 'new' ? 'home' : this.props.scene.icon
+                  }
+                />
+              </div>
+              {this.type === 'new' && (
+                <Form.Field>
+                  <label>Copy configuration from:</label>
+                  <Dropdown
+                    name="guests"
+                    placeholder="Select scene to copy configuration form"
+                    fluid
+                    onChange={this.setCopyFrom}
+                    options={this.state.scenes}
+                    value={this.state.copyFrom}
+                  />
+                </Form.Field>
+              )}
+              {this.type === 'modify' ? (
+                <Form.Field>
+                  <Segment compact style={{ marginBottom: '1rem' }}>
+                    <Checkbox
+                      label="Enable guest access"
+                      checked={this.state.guestAccessEnabled}
+                      toggle
+                      onChange={(e, val) => this.setGuestAccessEnabled(val.checked)}
+                    />
+                  </Segment>
+                </Form.Field>
+              ) : null}
             </Form>
 
-            {this.type === "modify" ? (
+            {this.type === 'modify' ? (
               <Button
                 icon
                 labelPosition="left"
@@ -168,18 +252,20 @@ class SceneModal extends Component {
           </Modal.Content>
           <Modal.Actions>
             <Button color="red" onClick={this.closeModal}>
-              <Icon name="remove" />{" "}
-              {this.type === "new" ? "Cancel" : "Discard changes"}
+              <Icon name="remove" />
+              {' '}
+              {this.type === 'new' ? 'Cancel' : 'Discard changes'}
             </Button>
 
             <Button
               color="green"
               onClick={
-                this.type === "new" ? this.addSceneModal : this.modifySceneModal
+                this.type === 'new' ? this.addSceneModal : this.modifySceneModal
               }
             >
-              <Icon name="checkmark" />{" "}
-              {this.type === "new" ? "Add scene" : "Save changes"}
+              <Icon name="checkmark" />
+              {' '}
+              {this.type === 'new' ? 'Add scene' : 'Save changes'}
             </Button>
           </Modal.Actions>
         </Modal>
@@ -188,17 +274,16 @@ class SceneModal extends Component {
   }
 }
 
-const setActiveScene = (activeScene) => {
-  return (dispatch) => dispatch(appActions.setActiveScene(activeScene));
-};
+const setActiveScene = (activeScene) => (dispatch) => dispatch(appActions.setActiveScene(activeScene));
 
 const mapStateToProps = (state, ownProps) => ({
   scene: ownProps.id ? state.scenes[ownProps.id] : null,
+  scenes: Object.values(state.scenes),
 });
 const SceneModalContainer = connect(
   mapStateToProps,
   { ...RemoteService, setActiveScene },
   null,
-  { forwardRef: true }
+  { forwardRef: true },
 )(SceneModal);
 export default SceneModalContainer;
diff --git a/smart-hut/src/components/SelectIcons.js b/smart-hut/src/components/SelectIcons.js
index 3722168..fa6cce6 100644
--- a/smart-hut/src/components/SelectIcons.js
+++ b/smart-hut/src/components/SelectIcons.js
@@ -1,5 +1,5 @@
-import React, { Component } from "react";
-import { Button, Grid } from "semantic-ui-react";
+import React, { Component } from 'react';
+import { Button, Grid } from 'semantic-ui-react';
 
 export default class SelectIcons extends Component {
   constructor(props) {
@@ -11,7 +11,7 @@ export default class SelectIcons extends Component {
 
   selectIcon = (e) => {
     let el = e.target.name;
-    if (e.target.tagName === "I") {
+    if (e.target.tagName === 'I') {
       el = e.target.parentNode.name;
     }
     this.props.updateIcon(el);
@@ -20,36 +20,32 @@ export default class SelectIcons extends Component {
 
   render() {
     const myicons = [
-      ["home", "coffee", "beer", "glass martini", "film", "video"],
-      ["music", "headphones", "fax", "phone", "laptop", "bath"],
-      ["shower", "bed", "child", "warehouse", "car", "bicycle"],
-      ["motorcycle", "archive", "boxes", "cubes", "chess", "gamepad"],
-      ["futbol", "table tennis", "server", "tv", "heart", "camera"],
-      ["trophy", "wrench", "image", "book", "university", "medkit"],
-      ["paw", "tree", "utensils", "male", "female", "life ring outline"],
+      ['home', 'coffee', 'beer', 'glass martini', 'film', 'video'],
+      ['music', 'headphones', 'fax', 'phone', 'laptop', 'bath'],
+      ['shower', 'bed', 'child', 'warehouse', 'car', 'bicycle'],
+      ['motorcycle', 'archive', 'boxes', 'cubes', 'chess', 'gamepad'],
+      ['futbol', 'table tennis', 'server', 'tv', 'heart', 'camera'],
+      ['trophy', 'wrench', 'image', 'book', 'university', 'medkit'],
+      ['paw', 'tree', 'utensils', 'male', 'female', 'life ring outline'],
     ];
 
     return (
       <Grid centered relaxed>
-        {myicons.map((e, i) => {
-          return (
-            <Grid.Row key={i}>
-              {e.map((e, i) => {
-                return (
-                  <Grid.Column key={i}>
-                    <Button
-                      name={e}
-                      color={e === this.state.currentIcon ? "black" : null}
-                      icon={e}
-                      size="small"
-                      onClick={this.selectIcon}
-                    />
-                  </Grid.Column>
-                );
-              })}
-            </Grid.Row>
-          );
-        })}
+        {myicons.map((e, i) => (
+          <Grid.Row key={i}>
+            {e.map((e, i) => (
+              <Grid.Column key={i}>
+                <Button
+                  name={e}
+                  color={e === this.state.currentIcon ? 'black' : null}
+                  icon={e}
+                  size="small"
+                  onClick={this.selectIcon}
+                />
+              </Grid.Column>
+                ))}
+          </Grid.Row>
+          ))}
       </Grid>
     );
   }
diff --git a/smart-hut/src/components/SimulationPanel.js b/smart-hut/src/components/SimulationPanel.js
new file mode 100644
index 0000000..5853b97
--- /dev/null
+++ b/smart-hut/src/components/SimulationPanel.js
@@ -0,0 +1,428 @@
+import React, { Component } from 'react';
+import {
+    Grid,
+    Divider,
+    Image,
+    Modal,
+    Button,
+  } from 'semantic-ui-react';
+import { connect } from 'react-redux';
+import { RemoteService } from '../remote';
+import SimulationPanelSlider from './SimulationPanelSlider.js';
+
+/*
+const SimulationPanel = (props) => (
+  <Modal
+    isOpen={!!props.simulationPanel}
+    contentLabel="Simulation Panel"
+    onRequestClose={props.closeSimulationPanel}
+    // style={ReactModalPortal,ReactModal__Overlay, modal}
+    style={{
+        overlay: {
+          position: 'fixed',
+          top: 0,
+          left: 0,
+          right: 0,
+          bottom: 0,
+          backgroundColor: 'rgba(0,0,0,0.5)',
+        },
+        content: {
+          position: 'absolute',
+          top: '40px',
+          left: '40px',
+          right: '40px',
+          bottom: '40px',
+          border: '1px solid #ccc',
+          background: '#fff',
+          overflow: 'auto',
+          WebkitOverflowScrolling: 'touch',
+          borderRadius: '4px',
+          outline: 'none',
+          padding: '20px',
+          backgroundColor: 'rgb(65, 67, 69)',
+        },
+      }}
+  >
+    {props.simulationPanel}
+    <Grid celled>
+
+      {/* TITLE }
+      <Grid.Row textAlign="center">
+        <h1 style={{ color: 'white', padding: '1rem', fontFamily: 'Arial' }}>
+        Welcome in the Simulation Panel
+        </h1>
+      </Grid.Row>
+
+      {/* TEMPERATURE SENSOR }
+      <Grid.Row>
+        <Grid.Column width={6} textAlign="center">
+          <Divider
+            style={{
+          marginTop: '3rem',
+          marginBottom: 'auto',
+      }}
+          />
+          <Image
+            src="./../img/thermo-simulation.png"
+            style={{
+                width: '60px',
+                height: 'auto',
+                display: 'block',
+                marginLeft: 'auto',
+                marginRight: 'auto',
+                marginTop: '1rem',
+                marginBottom: '1rem',
+            }}
+          />
+          <p style={{ color: 'white', padding: '0.5rem' }}>
+            Temperature Sensor
+          </p>
+          <Divider />
+        </Grid.Column>
+
+
+        <Grid.Column width={10} textAlign="center">
+
+          <div
+            style={{
+                display: 'block',
+                marginLeft: '30%',
+            }}
+          >
+            <SimulationPanelSlider />
+          </div>
+          <Divider />
+          <div
+            style={{
+              display: 'block',
+              marginLeft: '30%',
+          }}
+          >
+            <SimulationPanelSlider />
+          </div>
+        </Grid.Column>
+      </Grid.Row>
+
+      {/*  HUMIDTY SENSOR }
+      <Grid.Row>
+        <Grid.Column width={6} textAlign="center">
+          <Divider
+            style={{
+          marginTop: '3rem',
+          marginBottom: 'auto',
+      }}
+          />
+          <Image
+            src="./../img/humidity-simulation.png"
+            style={{
+                width: '60px',
+                height: 'auto',
+                display: 'block',
+                marginLeft: 'auto',
+                marginRight: 'auto',
+                marginTop: '1rem',
+                marginBottom: '1rem',
+            }}
+          />
+          <p style={{ color: 'white', padding: '0.5rem' }}>
+            Humidity Sensor
+          </p>
+          <Divider />
+        </Grid.Column>
+
+
+        <Grid.Column width={10} textAlign="center">
+
+          <div
+            style={{
+                display: 'block',
+                marginLeft: '30%',
+            }}
+          >
+            <SimulationPanelSlider />
+          </div>
+          <Divider />
+          <div
+            style={{
+              display: 'block',
+              marginLeft: '30%',
+          }}
+          >
+            <SimulationPanelSlider />
+          </div>
+        </Grid.Column>
+      </Grid.Row>
+
+      {/*  LIGHT SENSOR }
+      <Grid.Row>
+        <Grid.Column width={6} textAlign="center">
+          <Divider
+            style={{
+          marginTop: '3rem',
+          marginBottom: 'auto',
+      }}
+          />
+          <Image
+            src="./../img/light-simulation.png"
+            style={{
+                width: '60px',
+                height: 'auto',
+                display: 'block',
+                marginLeft: 'auto',
+                marginRight: 'auto',
+                marginTop: '1rem',
+                marginBottom: '1rem',
+            }}
+          />
+          <p style={{ color: 'white', padding: '0.5rem' }}>
+            Light Sensor
+          </p>
+          <Divider />
+        </Grid.Column>
+
+
+        <Grid.Column width={10} textAlign="center">
+
+          <div
+            style={{
+                display: 'block',
+                marginLeft: '30%',
+            }}
+          >
+            <SimulationPanelSlider />
+          </div>
+          <Divider />
+          <div
+            style={{
+              display: 'block',
+              marginLeft: '30%',
+          }}
+          >
+            <SimulationPanelSlider />
+          </div>
+        </Grid.Column>
+      </Grid.Row>
+
+      {/*  MOTION SENSOR }
+      <Grid.Row>
+        <Grid.Column width={6} textAlign="center">
+          <Divider
+            style={{
+          marginTop: '3rem',
+          marginBottom: 'auto',
+      }}
+          />
+          <Image
+            src="./../img/motion-simulation.png"
+            style={{
+                width: '60px',
+                height: 'auto',
+                display: 'block',
+                marginLeft: 'auto',
+                marginRight: 'auto',
+                marginTop: '1rem',
+                marginBottom: '1rem',
+            }}
+          />
+          <p style={{ color: 'white', padding: '0.5rem' }}>
+           Motion Sensor
+          </p>
+          <Divider />
+        </Grid.Column>
+
+
+        <Grid.Column width={10} textAlign="center">
+
+          <div
+            style={{
+                display: 'block',
+                marginLeft: '30%',
+            }}
+          >
+            <SimulationPanelSlider />
+          </div>
+          <Divider />
+          <div
+            style={{
+              display: 'block',
+              marginLeft: '30%',
+          }}
+          >
+            <SimulationPanelSlider />
+          </div>
+        </Grid.Column>
+      </Grid.Row>
+
+
+    </Grid>
+  </Modal>
+);
+*/
+class SimulationPanel extends Component {
+  constructor(props) {
+      super(props);
+      console.log(this.props.devices);
+      this.state = {
+        value: null,
+        error: null,
+      };
+      this.updateSliderValues = this.updateSliderValues.bind(this);
+      this.saveChanges = this.saveChanges.bind(this);
+  }
+
+  updateSliderValues(type, data, motion) {
+    console.log(data, motion);
+    this.setState({
+      [type ? 'error' : 'value']: parseInt(data),
+    });
+  }
+
+  saveChanges(device) {
+    console.log(this.state);
+    const { value } = this.state;
+    const { error } = this.state;
+    if (device.kind === 'sensor') {
+      this.props
+        .updateSimulation(
+          { ...device, typical: value, err: error },
+        )
+        .catch((err) => console.error('Simulation panel update error', err));
+    } else {
+      const val = device.kind === 'motionSensor' ? 'detected' : 'typical';
+      this.props
+        .saveDevice(
+          { ...device, [val]: value, err: error },
+          null,
+        )
+        .catch((err) => console.error('Simulation panel update error', err));
+    }
+  }
+
+  renderImage(device) {
+    let image = './../img/';
+    switch (device.kind) {
+      case 'thermostat':
+        image += 'thermo-simulation.png';
+        break;
+      case 'motionSensor':
+        image += 'motion-simulation.png';
+        break;
+      case 'sensor':
+        if (device.sensorType === 'TEMPERATURE') {
+          image += 'thermo-simulation.png';
+        } else if (device.sensorType === 'HUMIDITY') {
+          image += 'humidity-simulation.png';
+        } else {
+          image += 'light-simulation.png';
+        }
+        break;
+      default:
+        break;
+    }
+
+    return (
+      <Image
+        src={image}
+        style={{
+                  width: '60px',
+                  height: 'auto',
+                  display: 'block',
+                  marginLeft: 'auto',
+                  marginRight: 'auto',
+                  marginTop: '1rem',
+                  marginBottom: '1rem',
+              }}
+      />
+);
+  }
+
+  render() {
+    return (
+      <Modal
+        closeIcon
+        open={!!this.props.simulationPanel}
+        onClose={this.props.closeSimulationPanel}
+      >
+        <Grid celled>
+          <Grid.Row textAlign="center">
+            <h1 style={{ padding: '1rem', fontFamily: 'Arial' }}>
+              Welcome in the Simulation Panel
+            </h1>
+          </Grid.Row>
+          {
+            this.props.devices
+            ? this.props.devices.map((d, i) => (
+              <Grid.Row key={i}>
+                <Grid.Column width={6} textAlign="center">
+                  {this.renderImage(d)}
+                  <p style={{ padding: '0.5rem' }}>
+                    {d.name}
+                  </p>
+                  <Divider />
+                  <Button
+                    color="green"
+                    id={d.id}
+                    onClick={(e, { id }) => this.saveChanges(d, id)}
+                  >
+                    Save
+                  </Button>
+                </Grid.Column>
+
+
+                <Grid.Column width={10} textAlign="center">
+
+                  <div
+                    style={{
+                        display: 'block',
+                        marginLeft: '30%',
+                    }}
+                  >
+                    <SimulationPanelSlider update={this.updateSliderValues} error={false} device={d} id={d.id} />
+                  </div>
+                  {
+                    d.kind === 'motionSensor'
+                    ? null
+                    : (
+                      <>
+                        <Divider />
+                        <div
+                          style={{
+                          display: 'block',
+                          marginLeft: '30%',
+                      }}
+                        >
+                          <SimulationPanelSlider update={this.updateSliderValues} error device={d} id={d.id} />
+                        </div>
+                      </>
+)
+                  }
+                </Grid.Column>
+              </Grid.Row>
+            ))
+            : null
+          }
+        </Grid>
+
+      </Modal>
+    );
+  }
+}
+
+const mapStateToProps = (state, _) => ({
+  get devices() {
+      const deviceInternalSensor = {
+          thermostat: 'Thermostat',
+          sensor: 'Sensor',
+          motionSensor: 'Sensor',
+        };
+      const deviceArray = [
+      ...Object.values(state.devices),
+      ].filter((e) => e.kind in deviceInternalSensor);
+      return deviceArray;
+  },
+});
+const SimulationPanelContainer = connect(
+mapStateToProps,
+RemoteService,
+)(SimulationPanel);
+export default SimulationPanelContainer;
diff --git a/smart-hut/src/components/SimulationPanelSlider.js b/smart-hut/src/components/SimulationPanelSlider.js
new file mode 100644
index 0000000..e0c36ce
--- /dev/null
+++ b/smart-hut/src/components/SimulationPanelSlider.js
@@ -0,0 +1,131 @@
+import React, { Component } from 'react';
+import {
+ Form, Grid, Checkbox, Message, Label,
+} from 'semantic-ui-react';
+import { connect } from 'react-redux';
+import { RemoteService } from '../remote';
+
+class SimulationPanelSlider extends Component {
+  constructor(props) {
+      super(props);
+      console.log(this.props.device);
+      this.state = {
+        value: this.internalValue,
+        error: this.internalValue,
+      };
+      this.props.update(this.props.error, this.internalValue);
+      this.updateSliderValues = this.updateSliderValues.bind(this);
+  }
+
+  updateSliderValues(data) {
+    this.setState({
+        [this.props.error ? 'error' : 'value']: data,
+    });
+    console.log(this.state);
+    this.props.update(this.props.error, data, this.props.device.kind === 'motionSensor');
+  }
+
+  settings() {
+    let max;
+    let step;
+    switch (this.props.device.kind) {
+        case 'sensor':
+            if (this.props.device.sensorType === 'LIGHT') {
+                max = this.props.error ? 1000 : 15000;
+                step = 10;
+            } else {
+                max = 100;
+                step = 1;
+            }
+            break;
+        case 'thermostat':
+            max = 100;
+            step = 1;
+            break;
+        default:
+            break;
+    }
+    return { max, step };
+  }
+
+  get internalValue() {
+      if (this.props.device.kind === 'motionSensor') {
+          return this.props.device.detected;
+      }
+          return this.props.error ? this.props.device.err : this.props.device.typical.toFixed(2);
+  }
+
+  get getValue() {
+      switch (this.props.device.kind) {
+        case 'motionSensor':
+              return this.props.device.detected;
+        case 'thermostat':
+            return this.props.device.internalSensorTemperature;
+        case 'sensor':
+            return this.props.device.value.toFixed(2);
+        default:
+            return '';
+      }
+  }
+
+  render() {
+    return (
+      <Grid columns={2}>
+        <Grid.Column as={Form} textAlign="center">
+          <Message>
+            <Message.Header>{this.props.error ? 'Edit error' : 'Edit value'}</Message.Header>
+            <p>
+                Actual value of
+              {' '}
+              {this.props.device.name}
+:
+              {this.props.device.kind === 'motionSensor'
+                            ? this.getValue ? 'on' : 'off' : this.getValue}
+            </p>
+            <p>
+              {this.props.error ? 'error' : 'typical value'}
+              {' '}
+:
+              {this.props.device.kind === 'motionSensor'
+                            ? this.internalValue ? 'on' : 'off' : this.internalValue}
+            </p>
+          </Message>
+          {
+                this.props.device.kind === 'motionSensor'
+                ? (
+                  <Checkbox
+                    toggle
+                    name="value"
+                    checked={this.state.value}
+                    onChange={(e, { checked }) => this.updateSliderValues(checked)}
+                  />
+                 )
+                : (
+                  <>
+                    <Label>
+                            Value :
+                      <Label.Detail>{this.props.error ? this.state.error : this.state.value}</Label.Detail>
+                    </Label>
+                    <Form.Input
+                      min={0}
+                      max={this.settings().max}
+                      name="value"
+                      onChange={(e, { value }) => this.updateSliderValues(value)}
+                      step={this.settings().step}
+                      type="range"
+                      value={this.props.error ? this.state.error : this.state.value}
+                    />
+                  </>
+                    )
+            }
+        </Grid.Column>
+      </Grid>
+    );
+  }
+}
+
+const mapStateToProps = (state, ownProps) => ({
+    device: state.devices[ownProps.id],
+  });
+const SimulationPanelSliderContainer = connect(mapStateToProps, RemoteService)(SimulationPanelSlider);
+export default SimulationPanelSliderContainer;
diff --git a/smart-hut/src/components/VideoTest.js b/smart-hut/src/components/VideoTest.js
index 38fa8a1..2484dd3 100644
--- a/smart-hut/src/components/VideoTest.js
+++ b/smart-hut/src/components/VideoTest.js
@@ -1,5 +1,5 @@
-import React from "react";
-import DevicePanel from "./dashboard/DevicePanel";
+import React from 'react';
+import DevicePanel from './dashboard/DevicePanel';
 
 export default class VideoTest extends React.Component {
   render() {
diff --git a/smart-hut/src/components/dashboard/AutomationCreationModal.js b/smart-hut/src/components/dashboard/AutomationCreationModal.js
new file mode 100644
index 0000000..15563c3
--- /dev/null
+++ b/smart-hut/src/components/dashboard/AutomationCreationModal.js
@@ -0,0 +1,816 @@
+import React, { Component, useState, useRef } from 'react';
+import { connect } from 'react-redux';
+import { RemoteService } from '../../remote';
+import update from 'immutability-helper';
+import './Automations.css';
+
+import {
+    Segment,
+    Grid,
+    Icon,
+    Header,
+    Input,
+    Button,
+    Modal,
+    List,
+    Divider,
+    Menu,
+    Form,
+    Dropdown,
+    Checkbox,
+} from 'semantic-ui-react';
+
+export const operands = [
+    { key: 'EQUAL', text: '=', value: 'EQUAL' },
+    {
+        key: 'GREATER_EQUAL',
+        text: '\u2265',
+        value: 'GREATER_EQUAL',
+    },
+    {
+        key: 'GREATER',
+        text: '>',
+        value: 'GREATER',
+    },
+    {
+        key: 'LESS_EQUAL',
+        text: '\u2264',
+        value: 'LESS_EQUAL',
+    },
+    {
+        key: 'LESS',
+        text: '<',
+        value: 'LESS',
+    },
+];
+
+const deviceStateOptions = [
+    { key: 'off', text: 'off', value: false },
+    { key: 'on', text: 'on', value: true },
+];
+
+const thermostatOptions = [
+    { key: 'HEATING', text: 'HEATING', value: 'HEATING' },
+    { key: 'COOLING', text: 'COOLING', value: 'COOLING' },
+    { key: 'IDLE', text: 'IDLE', value: 'IDLE' },
+    { key: 'OFF', text: 'OFF', value: 'OFF' },
+];
+
+const thermostatOperands = [
+    { key: 'EQUAL', text: '=', value: 'EQUAL' },
+    { key: 'NOTEQUAL', text: '\u2260', value: 'NOTEQUAL' },
+];
+
+const CreateTrigger = (props) => {
+    const [activeOperand, setActiveOperand] = useState(true);
+    const [activeThermostat, setActiveThermostat] = useState(false);
+    const operandsRef = useRef(null);
+    const valuesRef = useRef(null);
+    const notAdmitedDevices = ['buttonDimmer'];
+    const hasOperand = new Set([
+        'knobDimmer',
+        'dimmableLight',
+        'curtains',
+        'sensor',
+    ]);
+    const deviceList = Object.values(props.devices)
+        .map((device) => ({
+            key: device.id,
+            text: device.name,
+            value: device.id,
+            kind: device.kind,
+        }))
+        .filter((e) => !notAdmitedDevices.includes(e.kind));
+
+    const onChange = (e, val) => {
+        props.inputChange(val);
+        setActiveOperand(hasOperand.has(props.devices[val.value].kind));
+        setActiveThermostat(props.devices[val.value].kind === 'thermostat' && props.condition);
+        if (operandsRef.current) operandsRef.current.setValue('');
+        if (valuesRef.current) valuesRef.current.inputRef.current.valueAsNumber = undefined;
+    };
+
+    return (
+      <List.Item>
+        <List.Content>
+          <Form>
+            <Form.Group>
+              <Form.Field inline width={7}>
+                <Dropdown
+                  onChange={onChange}
+                  name="device"
+                  search
+                  selection
+                  options={deviceList}
+                  placeholder="Device"
+                />
+              </Form.Field>
+              {
+                  activeThermostat ? (
+                    <>
+                      <Form.Field inline width={2}>
+                        <Dropdown
+                          onChange={(e, val) => props.inputChange(val)}
+                          ref={operandsRef}
+                          name="operand"
+                          compact
+                          selection
+                          options={thermostatOperands}
+                        />
+                      </Form.Field>
+                      <Form.Field inline width={7}>
+                        <Dropdown
+                          onChange={(e, val) => props.inputChange(val)}
+                          placeholder="State"
+                          name="mode"
+                          compact
+                          selection
+                          options={thermostatOptions}
+                        />
+                      </Form.Field>
+                    </>
+)
+                : activeOperand ? (
+                  <>
+                    <Form.Field inline width={2}>
+                      <Dropdown
+                        onChange={(e, val) => props.inputChange(val)}
+                        ref={operandsRef}
+                        name="operand"
+                        compact
+                        selection
+                        options={operands}
+                      />
+                    </Form.Field>
+                    <Form.Field inline width={7}>
+                      <Input
+                        onChange={(e, val) => {
+                                            props.inputChange(val);
+                                        }}
+                        ref={valuesRef}
+                        name="value"
+                        type="number"
+                        placeholder="Value"
+                      />
+                    </Form.Field>
+                  </>
+                        ) : (
+                          <Form.Field inline width={7}>
+                            <Dropdown
+                              onChange={(e, val) => props.inputChange(val)}
+                              placeholder="State"
+                              name="on"
+                              compact
+                              selection
+                              options={deviceStateOptions}
+                            />
+                          </Form.Field>
+                        )
+}
+            </Form.Group>
+          </Form>
+        </List.Content>
+      </List.Item>
+    );
+};
+
+const SceneItem = (props) => {
+    const position = props.order.indexOf(props.scene.id);
+    return (
+      <List.Item>
+        <List.Header>
+          <Grid textAlign="center">
+            <Grid.Row>
+              <Grid.Column width={4}>
+                <Checkbox
+                  toggle
+                  onChange={(e, val) => props.orderScenes(props.scene.id, val.checked)}
+                  checked={position + 1 > 0}
+                />
+              </Grid.Column>
+              <Grid.Column width={8}>
+                <h3>{props.scene.name}</h3>
+              </Grid.Column>
+              <Grid.Column width={4}>
+                <h3>{position !== -1 ? `# ${position + 1}` : ''}</h3>
+              </Grid.Column>
+            </Grid.Row>
+          </Grid>
+        </List.Header>
+      </List.Item>
+    );
+};
+
+const Trigger = ({
+                     deviceName, trigger, onRemove, index,
+                 }) => {
+    const {
+ operand, value, on, mode,
+} = trigger;
+    let symbol;
+    if (operand) {
+        symbol = operands.filter((opt) => opt.key === operand)[0].text;
+    }
+    return (
+      <List.Item className="trigger-item">
+        <Menu compact>
+          <Menu.Item as="span">{deviceName}</Menu.Item>
+          {operand ? <Menu.Item as="span">{symbol}</Menu.Item> : ''}
+          <Menu.Item as="span">{mode || (operand ? value : on ? 'on' : 'off')}</Menu.Item>
+        </Menu>
+        <Icon
+          as="i"
+          onClick={() => onRemove(index)}
+          className="remove-icon"
+          name="remove"
+        />
+      </List.Item>
+    );
+};
+
+class AutomationSaveModal extends Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            triggerList: [],
+            conditionsList: [],
+            order: [],
+            automationName: 'New Automation',
+            editName: false,
+            newTrigger: {},
+            newCondition: {},
+            scenesFilter: null,
+            openModal: false,
+        };
+
+        if (this.props.automation) {
+            this.state.automationName = this.props.automation.name;
+            for (const scenePriority of this.props.automation.scenes) {
+                this.state.order[scenePriority.priority] = scenePriority.sceneId;
+            }
+            for (const trigger of this.props.automation.triggers) {
+                this.state.triggerList.push(
+                    {
+                        device: trigger.deviceId,
+                        kind: trigger.kind,
+                        ...(trigger.kind === 'booleanTrigger'
+                            ? { on: trigger.on }
+                            : {
+                                operand: trigger.operator,
+                                value: trigger.value,
+                            }),
+                    },
+                );
+            }
+        }
+
+        this.setTrigger = this._setter('triggerList');
+        this.setOrder = this._setter('order');
+        this.setautomationName = this._setter('automationName');
+        this.setEditName = this._setter('editName');
+        this.setNewTrigger = this._setter('newTrigger');
+        this.addTrigger = this.addTrigger.bind(this);
+        this.removeTrigger = this.removeTrigger.bind(this);
+        this.onInputChange = this.onInputChange.bind(this);
+        this.searchScenes = this.searchScenes.bind(this);
+        this.orderScenes = this.orderScenes.bind(this);
+        this.onChangeName = this.onChangeName.bind(this);
+
+        // Conditions
+        this.setNewCondition = this._setter('newCondition');
+        this.addCondition = this.addCondition.bind(this);
+        this.removeCondition = this.removeCondition.bind(this);
+    }
+
+    openModal = (e) => {
+        this.setState({ openModal: true });
+    };
+
+    closeModal = (e) => {
+        this.setState({ openModal: false });
+    };
+
+    get deviceList() {
+        return Object.values(this.props.devices);
+    }
+
+    _setter(property) {
+        return (value) => this.setState(update(this.state, { [property]: { $set: value } }));
+    }
+
+    triggerKind(trigger) {
+        if ('operand' in trigger && 'value' in trigger) {
+            return 'rangeTrigger';
+        }
+        if ('on' in trigger) {
+            return 'booleanTrigger';
+        }
+        return false;
+        // throw new Error("Trigger kind not handled");
+    }
+
+    conditionKind(condition) {
+        if ('operand' in condition && 'value' in condition) {
+            return 'rangeTrigger';
+        }
+        if ('on' in condition) {
+            return 'booleanTrigger';
+        }
+
+        if ('operand' in condition && 'mode' in condition) {
+            return 'thermostatCondition';
+        }
+        return false;
+    }
+
+    checkRange(deviceKind, devicesWithPercentage, trigger, error, device) {
+        if (!trigger.device || !trigger.operand || !trigger.value) {
+            return error;
+        }
+        if (trigger.value < 0) {
+            error.message = 'Values cannot be negative';
+            return error;
+        }
+        // If the device's range is a percentage, values cannot exceed 100
+        if (
+            devicesWithPercentage.includes(deviceKind)
+            && trigger.value > 100
+        ) {
+            error.message = "The value can't exceed 100, as it's a percentage";
+            return error;
+        }
+        if (
+            deviceKind === 'sensor'
+            && device.sensor === 'HUMIDITY'
+            && trigger.value > 100
+        ) {
+            error.message = "The value can't exceed 100, as it's a percentage";
+            return error;
+        }
+        return false;
+    }
+
+    checkBool(trigger, error) {
+        if (!trigger.device || trigger.on === null || trigger.on === undefined) return error;
+        return false;
+    }
+
+    _checkNewTrigger(trigger, isCondition = false) {
+        const error = {
+            result: false,
+            message: 'There are missing fields!',
+        };
+        const device = Object.values(this.props.devices).filter(
+            (d) => d.id === trigger.device,
+        )[0];
+
+        const triggerKind = this.triggerKind(trigger);
+        const conditionKind = this.conditionKind(trigger);
+        if (!isCondition && (!device || !triggerKind)) {
+            error.message = 'There are missing fields';
+            return error;
+        }
+
+        if (isCondition && !conditionKind) {
+            error.message = 'There are missing fields';
+            return error;
+        }
+        const deviceKind = device.kind;
+        const devicesWithPercentage = ['dimmableLight', 'curtains', 'knobDimmer'];
+
+        switch (isCondition ? conditionKind : triggerKind) {
+            case 'booleanTrigger':
+                const checkBoolTrigger = this.checkBool(trigger, error);
+                if (checkBoolTrigger) {
+                    return checkBoolTrigger;
+                }
+                break;
+            case 'booleanCondition':
+                const checkBoolCond = this.checkBool(trigger, error);
+                if (checkBoolCond) {
+                    return checkBoolCond;
+                }
+                break;
+            case 'rangeTrigger':
+                const checkRangeTrigger = this.checkRange(deviceKind, devicesWithPercentage, trigger, error, device);
+                if (checkRangeTrigger) {
+                    return checkRangeTrigger;
+                }
+                break;
+            case 'rangeCondition':
+                const checkRangeCond = this.checkRange(deviceKind, devicesWithPercentage, trigger, error, device);
+                if (checkRangeCond) {
+                    return checkRangeCond;
+                }
+                break;
+            case 'thermostatCondition':
+                if (!trigger.device || trigger.mode === null || trigger.mode === undefined || !trigger.operand) return error;
+                break;
+            default:
+                throw new Error('theoretically unreachable statement');
+        }
+
+        let isNotDuplicate = null;
+
+        if (isCondition === true) {
+            isNotDuplicate = !this.state.conditionsList.some(
+                (t) => t.device === trigger.device && t.operand === trigger.operand,
+            );
+        } else {
+            isNotDuplicate = !this.state.triggerList.some(
+                (t) => t.device === trigger.device && t.operand === trigger.operand,
+            );
+        }
+        const type = isCondition ? 'condition' : 'trigger';
+        const duplicationMessage = `You have already created a ${type} for this device with the same conditions`;
+        return {
+            result: isNotDuplicate,
+            message: isNotDuplicate
+                ? null
+                : duplicationMessage,
+        };
+    }
+
+    addTrigger() {
+        const { result, message } = this._checkNewTrigger(this.state.newTrigger);
+        if (result) {
+            this.setState(
+                update(this.state, {
+                    triggerList: { $push: [this.state.newTrigger] },
+                }),
+            );
+        } else {
+            alert(message);
+        }
+    }
+
+    removeTrigger(index) {
+        this.setState(
+            update(this.state, { triggerList: { $splice: [[index, 1]] } }),
+        );
+    }
+
+    // This gets triggered when the devices dropdown changes the value.
+    onInputChange(val) {
+        if (val.name === 'device') {
+            this.setNewTrigger({ [val.name]: val.value });
+        } else {
+            this.setNewTrigger({
+                ...this.state.newTrigger,
+                [val.name]: val.value,
+            });
+        }
+    }
+
+    onChangeName(_, val) {
+        this.setautomationName(val.value);
+    }
+
+    orderScenes = (id, checked) => {
+        if (checked) {
+            this.setState(update(this.state, { order: { $push: [id] } }));
+        } else {
+            this.setState(
+                update(this.state, {
+                    order: (prevList) => prevList.filter((e) => e !== id),
+                }),
+            );
+        }
+    };
+
+    searchScenes(_, { value }) {
+        this.setState(update(this.state, { scenesFilter: { $set: value } }));
+        this.forceUpdate();
+    }
+
+    get sceneList() {
+        if (!this.scenesFilter) {
+            return this.props.scenes;
+        }
+        return this.props.scenes.filter((e) => e.name.includes(this.scenesFilter));
+    }
+
+    generateBoolKey(trigger) {
+        return `${trigger.device}${trigger.on}`;
+    }
+
+    generateRangeKey(trigger) {
+        return `${trigger.device}${trigger.operand}${trigger.value}`;
+    }
+
+    _generateKey = (trigger, isCondition = false) => {
+        switch (isCondition ? this.conditionKind(trigger) : this.triggerKind(trigger)) {
+            case 'booleanTrigger':
+                return this.generateBoolKey(trigger);
+            case 'booleanCondition':
+                return this.generateBoolKey(trigger);
+            case 'rangeTrigger':
+                return this.generateRangeKey(trigger);
+            case 'rangeCondition':
+                return this.generateRangeKey(trigger);
+            case 'thermostatCondition':
+                return `${trigger.device}${trigger.operand}${trigger.mode}`;
+            default:
+                throw new Error('theoretically unreachable statement');
+        }
+    };
+
+    checkBeforeSave = () => {
+        if (!this.state.automationName) {
+            alert('Give a name to the automation');
+            return false;
+        }
+        if (this.state.triggerList.length <= 0) {
+            alert('You have to create a trigger');
+            return false;
+        }
+        if (this.state.order.length <= 0) {
+            alert('You need at least one active scene');
+            return false;
+        }
+        return true;
+    };
+
+    saveAutomation = () => {
+        if (this.checkBeforeSave()) {
+            const automation = {
+                name: this.state.automationName,
+            };
+
+            if (this.props.id) {
+                automation.id = this.props.id;
+                automation.triggers = [];
+                automation.scenes = [];
+                automation.conditions = [];
+                for (let i = 0; i < this.state.order.length; i++) {
+                    automation.scenes.push({
+                        priority: i,
+                        sceneId: this.state.order[i],
+                    });
+                }
+
+                for (const trigger of this.state.triggerList) {
+                    const kind = trigger.kind || this.triggerKind(trigger);
+                    automation.triggers.push(
+                        {
+                            deviceId: trigger.device,
+                            kind,
+                            ...(kind === 'booleanTrigger'
+                                ? { on: trigger.on }
+                                : {
+                                    operator: trigger.operand,
+                                    range: parseInt(trigger.value),
+                                }),
+                        },
+                    );
+                }
+
+                for (const condition of this.state.conditionsList) {
+                    const kind = condition.kind || this.conditionKind(condition);
+                    const loSpagnolo = (kind === 'thermostatCondition' ? { operator: condition.operand, mode: condition.mode }
+                        : {
+                            operator: condition.operand,
+                            range: parseInt(condition.value),
+                        });
+                    automation.conditions.push(
+                        {
+                            deviceId: condition.device,
+                            kind,
+                            ...(kind === 'booleanTrigger'
+                                ? { on: condition.on }
+                                : loSpagnolo
+                            ),
+                        },
+                    );
+                }
+
+                this.props
+                    .fastUpdateAutomation(automation)
+                    .then(this.closeModal)
+                    .catch(console.error);
+            } else {
+                this.props
+                    .saveAutomation({
+                        automation,
+                        triggerList: this.state.triggerList,
+                        order: this.state.order,
+                        conditionList: this.state.conditionsList,
+                    })
+                    .then(this.closeModal)
+                    .catch(console.error);
+            }
+        }
+    };
+
+    get trigger() {
+        return this.props.id ? (
+          <Button
+            style={{ display: 'inline' }}
+            circular
+            size="small"
+            icon="edit"
+            onClick={this.openModal}
+          />
+        ) : (
+          <Button icon labelPosition="left" color="green" onClick={this.openModal}>
+            <Icon name="add" />
+                Create new automation
+          </Button>
+        );
+    }
+
+    // CONDITIONS
+
+    addCondition() {
+        // Same method used to check triggers and conditions, not a mistake
+        const { result, message } = this._checkNewTrigger(this.state.newCondition, true);
+        if (result) {
+            this.setState(
+                update(this.state, {
+                    conditionsList: { $push: [this.state.newCondition] },
+                }),
+            );
+        } else {
+            alert(message);
+        }
+    }
+
+    removeCondition(index) {
+        this.setState(
+            update(this.state, { conditionsList: { $splice: [[index, 1]] } }),
+        );
+    }
+
+    onInputChangeCondition = (val) => {
+        if (val.name === 'device') {
+            this.setNewCondition({ [val.name]: val.value });
+        } else {
+            this.setNewCondition({
+                ...this.state.newCondition,
+                [val.name]: val.value,
+            });
+        }
+    }
+
+    render() {
+        console.log(this.state.conditionsList);
+        return (
+          <Modal
+            closeIcon
+            trigger={this.trigger}
+            open={this.state.openModal}
+            onClose={this.closeModal}
+          >
+            <Segment basic>
+              <Header style={{ display: 'inline', marginRight: '1rem' }}>
+                {this.state.editName ? (
+                  <Input
+                    focus
+                    transparent
+                    placeholder="New automation name..."
+                    onChange={this.onChangeName}
+                  />
+                        ) : (
+                            this.state.automationName
+                        )}
+              </Header>
+              <Button
+                onClick={() => this.setEditName((prev) => !prev)}
+                style={{ display: 'inline' }}
+                circular
+                size="small"
+                icon={this.state.editName ? 'save' : 'edit'}
+              />
+
+              <Segment placeholder className="segment-automations">
+                <Grid columns={2} stackable textAlign="center">
+                  <Divider vertical />
+                  <Grid.Row verticalAlign="middle">
+                    <Grid.Column>
+                      <Header>Create Triggers</Header>
+                      <List divided relaxed>
+                        {this.state.triggerList.length > 0
+                                        && this.state.triggerList.map((trigger, i) => {
+                                            const deviceName = this.deviceList.filter(
+                                                (d) => d.id === trigger.device,
+                                            )[0].name;
+                                            const key = this._generateKey(trigger);
+                                            return (
+                                              <Trigger
+                                                key={key}
+                                                index={i}
+                                                deviceName={deviceName}
+                                                trigger={trigger}
+                                                onRemove={this.removeTrigger}
+                                              />
+                                            );
+                                        })}
+                        <CreateTrigger
+                          devices={this.props.devices}
+                          inputChange={this.onInputChange}
+                        />
+                      </List>
+                      <Button
+                        onClick={this.addTrigger}
+                        circular
+                        icon="add"
+                        color="blue"
+                        size="huge"
+                      />
+                    </Grid.Column>
+                    <Grid.Column>
+                      {this.props.scenes.length > 0 ? (
+                        <>
+                          <Header>Activate Scenes</Header>
+                          <Input
+                            icon="search"
+                            placeholder="Search..."
+                            fluid
+                            onChange={this.searchScenes}
+                          />
+                          <Divider horizontal />
+                          <List divided relaxed>
+                            {this.sceneList.map((scene) => (
+                              <SceneItem
+                                key={scene.id}
+                                scene={scene}
+                                order={this.state.order}
+                                orderScenes={this.orderScenes}
+                              />
+                                                ))}
+                          </List>
+                        </>
+                                    ) : (
+                                      <>
+                                        <Header icon>
+                                          <Icon name="world" />
+                                        </Header>
+                                        <Button primary>Create Scene</Button>
+                                      </>
+                                    )}
+                    </Grid.Column>
+                  </Grid.Row>
+                </Grid>
+              </Segment>
+              <Grid columns={1} stackable textAlign="center">
+                <Grid.Row verticalAlign="middle">
+                  <Grid.Column>
+                    <Header>Add Conditions</Header>
+                    <List divided relaxed>
+                      {this.state.conditionsList.length > 0
+                                    && this.state.conditionsList.map((condition, i) => {
+                                        const deviceName = this.deviceList.filter(
+                                            (d) => d.id === condition.device,
+                                        )[0].name;
+                                        const key = this._generateKey(condition, true);
+                                        return (
+                                          <Trigger
+                                            key={key}
+                                            index={i}
+                                            deviceName={deviceName}
+                                            trigger={condition}
+                                            onRemove={this.removeCondition}
+                                          />
+                                        );
+                                    })}
+                      <CreateTrigger
+                        condition
+                        devices={this.props.devices}
+                        inputChange={this.onInputChangeCondition}
+                      />
+                    </List>
+                    <Button
+                      onClick={this.addCondition}
+                      circular
+                      icon="add"
+                      color="blue"
+                      size="huge"
+                    />
+                  </Grid.Column>
+                </Grid.Row>
+              </Grid>
+              <Grid>
+                <Grid.Row>
+                  <Grid.Column style={{ marginRight: '1rem' }}>
+                    <Button onClick={() => this.saveAutomation()} color="green">
+                      {this.props.id ? 'Save' : 'Create'}
+                    </Button>
+                  </Grid.Column>
+                </Grid.Row>
+              </Grid>
+            </Segment>
+          </Modal>
+        );
+    }
+}
+
+const mapStateToProps = (state, ownProps) => ({
+    scenes: Object.values(state.scenes),
+    devices: state.devices,
+    automation: ownProps.id ? state.automations[ownProps.id] : null,
+});
+const AutomationSaveModalContainer = connect(
+    mapStateToProps,
+    RemoteService,
+)(AutomationSaveModal);
+export default AutomationSaveModalContainer;
diff --git a/smart-hut/src/components/dashboard/AutomationsPanel.js b/smart-hut/src/components/dashboard/AutomationsPanel.js
index 2a7b683..69c6035 100644
--- a/smart-hut/src/components/dashboard/AutomationsPanel.js
+++ b/smart-hut/src/components/dashboard/AutomationsPanel.js
@@ -1,456 +1,64 @@
-import React, { Component, useState, useEffect } from "react";
-import { connect } from "react-redux";
-import { RemoteService } from "../../remote";
-import "./Automations.css";
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { RemoteService } from '../../remote';
+import './Automations.css';
 
 import {
   Segment,
   Grid,
-  Icon,
   Header,
-  Input,
   Button,
   List,
-  Dropdown,
-  Form,
   Divider,
-  Checkbox,
   Menu,
-} from "semantic-ui-react";
+} from 'semantic-ui-react';
+import CreateAutomation, { operands } from './AutomationCreationModal';
 
-const operands = [
-  { key: "EQUAL", text: "=", value: "EQUAL" },
-  {
-    key: "GREATER_EQUAL",
-    text: "\u2265",
-    value: "GREATER_EQUAL",
-  },
-  {
-    key: "GREATER",
-    text: ">",
-    value: "GREATER",
-  },
-  {
-    key: "LESS_EQUAL",
-    text: "\u2264",
-    value: "LESS_EQUAL",
-  },
-  {
-    key: "LESS",
-    text: "<",
-    value: "LESS",
-  },
-];
-
-const deviceStateOptions = [
-  { key: "off", text: "off", value: false },
-  { key: "on", text: "on", value: true },
-];
-
-const CreateTrigger = (props) => {
-  const [activeOperand, setActiveOperand] = useState(true);
-  const admitedDevices = ["sensor", "regularLight", "dimmableLight"]; // TODO Complete this list
-  const deviceList = props.devices
-    .map((device) => {
-      return {
-        key: device.id,
-        text: device.name,
-        value: device.id,
-        kind: device.kind,
-      };
-    })
-    .filter((e) => admitedDevices.includes(e.kind));
-
-  const onChange = (e, val) => {
-    props.inputChange(val);
-    if (
-      props.devices.filter((d) => d.id === val.value)[0].hasOwnProperty("on")
-    ) {
-      setActiveOperand(false);
-    } else {
-      setActiveOperand(true);
-    }
-  };
-
-  return (
-    <List.Item>
-      <List.Content>
-        <Form>
-          <Form.Group>
-            <Form.Field inline width={7}>
-              <Dropdown
-                onChange={onChange}
-                name="device"
-                search
-                selection
-                options={deviceList}
-                placeholder="Device"
-              />
-            </Form.Field>
-            {activeOperand ? (
-              <React.Fragment>
-                <Form.Field inline width={2}>
-                  <Dropdown
-                    onChange={(e, val) => props.inputChange(val)}
-                    name="operand"
-                    compact
-                    selection
-                    options={operands}
-                  />
-                </Form.Field>
-                <Form.Field inline width={7}>
-                  <Input
-                    onChange={(e, val) => props.inputChange(val)}
-                    name="value"
-                    type="number"
-                    placeholder="Value"
-                  />
-                </Form.Field>
-              </React.Fragment>
-            ) : (
-              <Form.Field inline width={7}>
-                <Dropdown
-                  onChange={(e, val) => props.inputChange(val)}
-                  placeholder="State"
-                  name="value"
-                  compact
-                  selection
-                  options={deviceStateOptions}
-                />
-              </Form.Field>
-            )}
-          </Form.Group>
-        </Form>
-      </List.Content>
-    </List.Item>
-  );
-};
-
-const SceneItem = (props) => {
-  let position = props.order.indexOf(props.scene.id);
-  return (
-    <List.Item>
-      <List.Header>
-        <Grid textAlign="center">
-          <Grid.Row>
-            <Grid.Column width={4}>
-              <Checkbox
-                toggle
-                onChange={(e, val) =>
-                  props.orderScenes(props.scene.id, val.checked)
-                }
-                checked={position + 1 > 0}
-              />
-            </Grid.Column>
-            <Grid.Column width={8}>
-              <h3>{props.scene.name}</h3>
-            </Grid.Column>
-            <Grid.Column width={4}>
-              <h3>{position !== -1 ? "# " + (position + 1) : ""}</h3>
-            </Grid.Column>
-          </Grid.Row>
-        </Grid>
-      </List.Header>
-    </List.Item>
-  );
-};
-
-const Trigger = ({ deviceName, trigger, onRemove, index }) => {
-  const { operand, value } = trigger;
-  let symbol;
-  if (operand) {
-    symbol = operands.filter((opt) => opt.key === operand)[0].text;
-  }
-  return (
-    <List.Item className="trigger-item">
-      <Menu compact>
-        <Menu.Item as="span">{deviceName}</Menu.Item>
-        {operand ? <Menu.Item as="span">{symbol}</Menu.Item> : ""}
-        <Menu.Item as="span">
-          {operand ? value : value ? "on" : "off"}
-        </Menu.Item>
-      </Menu>
-      <Icon
-        as={"i"}
-        onClick={() => onRemove(index)}
-        className="remove-icon"
-        name="remove"
-      />
-    </List.Item>
-  );
-};
-
-export const CreateAutomation = (props) => {
-  const [triggerList, setTrigger] = useState([]);
-  const [order, setOrder] = useState([]);
-  const [stateScenes, setScenes] = useState(props.scenes);
-  const [automationName, setautomationName] = useState("New Automation");
-  const [editName, setEditName] = useState(false);
-  const [newTrigger, setNewTrigger] = useState({});
-
-  useEffect(() => {
-    setScenes(props.scenes);
-  }, [props]);
-
-  const _checkNewTrigger = (trigger) => {
-    const auxDevice = props.devices.filter((d) => d.id === trigger.device)[0];
-    if (auxDevice && auxDevice.hasOwnProperty("on")) {
-      if (!trigger.device || !trigger.value == null) {
-        return {
-          result: false,
-          message: "There are missing fields!",
-        };
-      }
-    } else {
-      if (!trigger.device || !trigger.operand || !trigger.value) {
-        return {
-          result: false,
-          message: "There are missing fields",
-        };
-      }
-    }
-    const result = !triggerList.some(
-      (t) => t.device === trigger.device && t.operand === trigger.operand
-    );
-    return {
-      result: result,
-      message: result
-        ? ""
-        : "You have already created a trigger for this device with the same conditions",
-    };
-  };
-  const addTrigger = () => {
-    const { result, message } = _checkNewTrigger(newTrigger);
-    const auxTrigger = newTrigger;
-    if (result) {
-      if (
-        props.devices
-          .filter((d) => d.id === newTrigger.device)[0]
-          .hasOwnProperty("on")
-      ) {
-        delete auxTrigger.operand;
-      }
-      setTrigger((prevList) => [...prevList, auxTrigger]);
-    } else {
-      alert(message);
-    }
-  };
-
-  const removeTrigger = (index) => {
-    setTrigger((prevList) => prevList.filter((t, i) => i !== index));
-  };
-
-  // This gets triggered when the devices dropdown changes the value.
-  const onInputChange = (val) => {
-    setNewTrigger({ ...newTrigger, [val.name]: val.value });
-  };
-  const onChangeName = (e, val) => setautomationName(val.value);
-
-  const orderScenes = (id, checked) => {
-    if (checked) {
-      setOrder((prevList) => [...prevList, id]);
-    } else {
-      setOrder((prevList) => prevList.filter((e) => e !== id));
-    }
-  };
-  const searchScenes = (e, { value }) => {
-    if (value.length > 0) {
-      setScenes((prevScenes) => {
-        return stateScenes.filter((e) => {
-          return e.name.includes(value);
-        });
-      });
-    } else {
-      setScenes(props.scenes);
-    }
-  };
-
-  const _generateKey = (trigger) => {
-    if (trigger.hasOwnProperty("operand")) {
-      return trigger.device + trigger.operand + trigger.value;
-    }
-    return trigger.device + trigger.value;
-  };
-
-  /*const checkBeforeSave = () => {
-    if (automationName.length <= 0) {
-      alert("Give a name to the automation");
-      return false;
-    }
-    if (triggerList.length <= 0) {
-      alert("You have to create a trigger");
-      return false;
-    }
-    if (order.length <= 0) {
-      alert("You need at least one active scene");
-      return false;
-    }
-    return true;
-  };*/
-
-  const saveAutomation = () => {
-    //if(checkBeforeSave()){
-    const automation = {
-      name: automationName,
-    };
-    props.save({ automation, triggerList, order });
-    //}
-  };
-
-  return (
-    <React.Fragment>
-      <Header style={{ display: "inline", marginRight: "1rem" }}>
-        {editName ? (
-          <Input
-            focus
-            transparent
-            placeholder="New automation name..."
-            onChange={onChangeName}
-          />
-        ) : (
-          automationName
-        )}
-      </Header>
-
-      <Button
-        onClick={() => setEditName((prev) => !prev)}
-        style={{ display: "inline" }}
-        circular
-        size="small"
-        icon={editName ? "save" : "edit"}
-      />
-
-      <Segment placeholder className="segment-automations">
-        <Grid columns={2} stackable textAlign="center">
-          <Divider vertical />
-          <Grid.Row verticalAlign="middle">
-            <Grid.Column>
-              <Header>Create Triggers</Header>
-              <List divided relaxed>
-                {triggerList.length > 0 &&
-                  triggerList.map((trigger, i) => {
-                    const deviceName = props.devices.filter(
-                      (d) => d.id === trigger.device
-                    )[0].name;
-                    const key = _generateKey(trigger);
-                    return (
-                      <Trigger
-                        key={key}
-                        index={i}
-                        deviceName={deviceName}
-                        trigger={trigger}
-                        onRemove={removeTrigger}
-                      />
-                    );
-                  })}
-                <CreateTrigger
-                  devices={props.devices}
-                  inputChange={onInputChange}
-                />
-              </List>
-              <Button
-                onClick={addTrigger}
-                circular
-                icon="add"
-                color="blue"
-                size="huge"
-              />
-            </Grid.Column>
-            <Grid.Column>
-              {props.scenes.length > 0 ? (
-                <React.Fragment>
-                  <Header>Activate Scenes</Header>
-                  <Input
-                    icon="search"
-                    placeholder="Search..."
-                    fluid
-                    onChange={searchScenes}
-                  />
-                  <Divider horizontal />
-                  <List divided relaxed>
-                    {stateScenes.map((scene) => (
-                      <SceneItem
-                        key={scene.id}
-                        scene={scene}
-                        order={order}
-                        orderScenes={orderScenes}
-                      />
-                    ))}
-                  </List>
-                </React.Fragment>
-              ) : (
-                <React.Fragment>
-                  <Header icon>
-                    <Icon name="world" />
-                  </Header>
-                  <Button primary>Create Scene</Button>
-                </React.Fragment>
-              )}
-            </Grid.Column>
-          </Grid.Row>
-        </Grid>
-      </Segment>
-      <Grid>
-        <Grid.Row>
-          <Grid.Column style={{ marginRight: "1rem" }}>
-            <Button onClick={() => saveAutomation()} color="green">
-              SAVE
-            </Button>
-          </Grid.Column>
-        </Grid.Row>
-      </Grid>
-    </React.Fragment>
-  );
-};
-
-const Automation = ({ automation, devices, scenes, removeAutomation }) => {
-  const { triggers } = automation;
+const Automation = ({
+ automation, devices, scenes, removeAutomation,
+}) => {
+  const { triggers, conditions } = automation;
   const scenePriorities = automation.scenes;
-  const getOperator = (operand) =>
-    operands.filter((o) => o.key === operand)[0].text;
+  const getOperator = (operand) => operands.filter((o) => o.key === operand)[0].text;
 
   return (
-    <React.Fragment>
-      <Header style={{ display: "inline", marginRight: "1rem" }}>
+    <>
+      <Header style={{ display: 'inline', marginRight: '1rem' }}>
         {automation.name}
       </Header>
+      <CreateAutomation id={automation.id} />
       <Button
-        style={{ display: "inline" }}
-        circular
-        size="small"
-        icon={"edit"}
-      />
-      <Button
-        style={{ display: "inline" }}
+        style={{ display: 'inline' }}
         circular
         onClick={() => removeAutomation(automation.id)}
         color="red"
         size="small"
-        icon={"trash alternate outline"}
+        icon="trash alternate outline"
       />
       <Segment placeholder>
         <Grid columns={2} stackable textAlign="center">
-          <Divider vertical></Divider>
+          <Divider vertical />
           <Grid.Row verticalAlign="middle">
             <Grid.Column>
               <Header>Triggers</Header>
               <List divided relaxed>
-                {triggers !== undefined &&
-                  triggers.map((trigger) => {
+                {triggers !== undefined
+                  && triggers.map((trigger) => {
                     const device = devices.filter(
-                      (d) => d.id === trigger.deviceId
+                      (d) => d.id === trigger.deviceId,
                     )[0];
                     return (
                       <Menu key={trigger.id} compact>
                         <Menu.Item as="span">
-                          {device.name}{" "}
+                          {device.name}
+                          {' '}
                           {trigger.operator
-                            ? getOperator(trigger.operator) +
-                              " " +
-                              trigger.range
-                            : trigger.value
-                            ? " - on"
-                            : " - off"}
+                            ? `${getOperator(trigger.operator)
+                              } ${
+                              trigger.range}`
+                            : trigger.on
+                            ? ' - on'
+                            : ' - off'}
                         </Menu.Item>
                       </Menu>
                     );
@@ -460,11 +68,12 @@ const Automation = ({ automation, devices, scenes, removeAutomation }) => {
             <Grid.Column>
               <Header>Scenes</Header>
               <List divided relaxed>
-                {scenePriorities !== undefined &&
-                  scenePriorities.map((sp) => {
+                {scenePriorities !== undefined
+                  && scenePriorities.map((sp) => {
                     const sceneData = scenes.filter(
-                      (s) => s.id === sp.sceneId
+                      (s) => s.id === sp.sceneId,
                     )[0];
+                    if (!sceneData) return '';
                     return (
                       <Menu key={sceneData.id} compact>
                         <Menu.Item as="span">{sceneData.name}</Menu.Item>
@@ -476,7 +85,37 @@ const Automation = ({ automation, devices, scenes, removeAutomation }) => {
           </Grid.Row>
         </Grid>
       </Segment>
-    </React.Fragment>
+      <Grid columns={1} stackable textAlign="center">
+        <Grid.Row verticalAlign="middle">
+          <Grid.Column>
+            <Header>Conditions</Header>
+            <List divided relaxed>
+              {conditions !== undefined
+                  && conditions.map((condition) => {
+                    const device = devices.filter(
+                      (d) => d.id === condition.deviceId,
+                    )[0];
+                    return (
+                      <Menu key={condition.id} compact>
+                        <Menu.Item as="span">
+                          {device.name}
+                          {' '}
+                          {condition.operator
+                            ? `${getOperator(condition.operator)
+                              } ${
+                              condition.mode ? condition.mode : condition.range}`
+                            : condition.on
+                            ? ' - on'
+                            : ' - off'}
+                        </Menu.Item>
+                      </Menu>
+                    );
+                  })}
+            </List>
+          </Grid.Column>
+        </Grid.Row>
+      </Grid>
+    </>
   );
 };
 
@@ -496,13 +135,13 @@ class AutomationsPanel extends Component {
   getDevices() {
     this.props
       .fetchDevices()
-      .catch((err) => console.error(`error fetching devices:`, err));
+      .catch((err) => console.error('error fetching devices:', err));
   }
 
   getAutomations() {
     this.props
       .fetchAutomations()
-      .catch((err) => console.error(`error fetching automations:`, err));
+      .catch((err) => console.error('error fetching automations:', err));
   }
 
   removeAutomation = (id) => {
@@ -513,16 +152,12 @@ class AutomationsPanel extends Component {
 
   render() {
     return (
-      <Grid style={{ marginTop: "3rem" }}>
+      <Grid style={{ marginTop: '3rem' }}>
         <Grid.Row>
           <Grid.Column textAlign="center" width={16}>
             {!this.state.openModal ? (
               <List>
-                <CreateAutomation
-                  save={this.props.saveAutomation}
-                  scenes={this.props.scenes}
-                  devices={this.props.devices}
-                />
+                <CreateAutomation />
               </List>
             ) : (
               <Button color="green">CREATE AUTOMATION</Button>
@@ -530,19 +165,16 @@ class AutomationsPanel extends Component {
           </Grid.Column>
         </Grid.Row>
         <Grid.Row>
-          {this.props.automations.map((automation, i) => {
-            console.log(23, automation, i, this.props.automations);
-            return (
-              <Grid.Column key={i} width={8} style={{ margin: "2rem 0" }}>
-                <Automation
-                  removeAutomation={this.removeAutomation}
-                  scenes={this.props.scenes}
-                  devices={this.props.devices}
-                  automation={automation}
-                />
-              </Grid.Column>
-            );
-          })}
+          {this.props.automations.map((automation, i) => (
+            <Grid.Column key={i} width={8} style={{ margin: '2rem 0' }}>
+              <Automation
+                removeAutomation={this.removeAutomation}
+                scenes={this.props.scenes}
+                devices={this.props.devices}
+                automation={automation}
+              />
+            </Grid.Column>
+            ))}
         </Grid.Row>
       </Grid>
     );
@@ -559,12 +191,11 @@ const mapStateToProps = (state, _) => ({
     return Object.values(state.devices);
   },
   get automations() {
-    console.log(state.automations);
     return Object.values(state.automations);
   },
 });
 const AutomationsPanelContainer = connect(
   mapStateToProps,
-  RemoteService
+  RemoteService,
 )(AutomationsPanel);
 export default AutomationsPanelContainer;
diff --git a/smart-hut/src/components/dashboard/DevicePanel.js b/smart-hut/src/components/dashboard/DevicePanel.js
index 449642e..bd28993 100644
--- a/smart-hut/src/components/dashboard/DevicePanel.js
+++ b/smart-hut/src/components/dashboard/DevicePanel.js
@@ -1,11 +1,13 @@
 // vim: set ts=2 sw=2 et tw=80:
 
-import React, { Component } from "react";
-import { Grid } from "semantic-ui-react";
-import Device from "./devices/Device";
-import NewDevice from "./devices/NewDevice";
-import { connect } from "react-redux";
-import { RemoteService } from "../../remote";
+import React, { Component } from 'react';
+import {
+ Segment, Card, Header, Icon,
+} from 'semantic-ui-react';
+import { connect } from 'react-redux';
+import Device from './devices/Device';
+import NewDevice from './devices/NewDevice';
+import { RemoteService } from '../../remote';
 
 class DevicePanel extends Component {
   constructor(props) {
@@ -15,29 +17,40 @@ class DevicePanel extends Component {
   }
 
   getDevices() {
-    if (this.props.tab === "Devices") {
+    if (this.props.tab === 'Devices') {
       this.props
         .fetchDevices()
-        .catch((err) => console.error(`error fetching devices:`, err));
+        .catch((err) => console.error('error fetching devices:', err));
     }
   }
 
   render() {
     return (
-      <Grid doubling columns={2} divided="vertically">
-        {this.props.devices.map((e, i) => {
-          return (
-            <Grid.Column key={i}>
-              <Device tab={this.props.tab} id={e.id} />
-            </Grid.Column>
-          );
-        })}
-        {!this.props.isActiveRoomHome ? (
-          <Grid.Column>
-            <NewDevice />
-          </Grid.Column>
-        ) : null}
-      </Grid>
+      <Card.Group centered style={{ paddingTop: '3rem' }}>
+        {this.props.numbeOfRooms > 0 ? (
+          <>
+            {this.props.devices.map((e, i) => <Device key={i} tab={this.props.tab} id={e.id} />)}
+            {!this.props.isActiveRoomHome ? (
+              <Card style={{ height: '27em' }}>
+                <Segment basic style={{ width: '100%', height: '100%' }}>
+                  <NewDevice />
+                </Segment>
+              </Card>
+            ) : null}
+          </>
+        ) : (
+          <Segment placeholder>
+            <Header icon>
+              <Icon
+                name="exclamation triangle"
+                style={{ paddingBottom: '1rem' }}
+              />
+              Please create a room on the left, and then add devices to the
+              same.
+            </Header>
+          </Segment>
+        )}
+      </Card.Group>
     );
   }
 }
@@ -46,20 +59,22 @@ const mapStateToProps = (state, _) => ({
   get devices() {
     if (state.active.activeRoom === -1) {
       return Object.values(state.devices);
-    } else {
+    }
       const deviceArray = [
         ...state.rooms[state.active.activeRoom].devices,
       ].sort();
       return deviceArray.map((id) => state.devices[id]);
-    }
   },
   get isActiveRoomHome() {
     return state.active.activeRoom === -1;
   },
   activeRoom: state.active.activeRoom,
+  get numbeOfRooms() {
+    return Object.keys(state.rooms).length;
+  },
 });
 const DevicePanelContainer = connect(
   mapStateToProps,
-  RemoteService
+  RemoteService,
 )(DevicePanel);
 export default DevicePanelContainer;
diff --git a/smart-hut/src/components/dashboard/HostsPanel.js b/smart-hut/src/components/dashboard/HostsPanel.js
new file mode 100644
index 0000000..d5bbc37
--- /dev/null
+++ b/smart-hut/src/components/dashboard/HostsPanel.js
@@ -0,0 +1,96 @@
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import {
+ Card, Segment, Header, Icon, Button,
+} from 'semantic-ui-react';
+import { RemoteService } from '../../remote';
+import Device from './devices/Device';
+
+class HostsPanel extends Component {
+  componentDidUpdate(oldProps) {
+    if (
+      oldProps.activeHost !== this.props.activeHost
+      && this.props.activeHost !== -1
+    ) {
+      this.props.fetchDevices(null, this.props.activeHost).catch(console.error);
+      this.props.fetchAllRooms(this.props.activeHost).catch(console.error);
+      this.props.fetchAllScenes(this.props.activeHost).catch(console.error);
+    }
+  }
+
+  applyHostScene(id) {
+    this.props
+      .sceneApply(id, this.props.activeHost)
+      .then(() => console.log('SCCUESS'))
+      .catch((err) => console.error('sceneApply update error', err));
+  }
+
+  render() {
+    if (this.props.isActiveDefaultHost) {
+      return (
+        <Card.Group centered style={{ paddingTop: '3rem' }}>
+          <Segment placeholder>
+            <Header icon>
+              <Icon
+                name="exclamation triangle"
+                style={{ paddingBottom: '1rem' }}
+              />
+              Please select a host to visit on the left.
+            </Header>
+          </Segment>
+        </Card.Group>
+      );
+    }
+
+    return (
+      <>
+        <Header style={{ textAlign: 'center', marginTop: '3rem' }} as="h3">
+          Scenes
+        </Header>
+        <Card.Group centered>
+          {this.props.hostScenes.map((scene) => (
+            <Card>
+              <Card.Header textAlign="center">
+                <Header style={{ margin: '1.5rem 0' }} as="h3">
+                  {scene.name}
+                  {' '}
+                  <Icon name={scene.icon} />
+                </Header>
+              </Card.Header>
+              <Card.Content extras>
+                <div className="ui two buttons">
+                  <Button onClick={() => this.applyHostScene(scene.id)}>
+                    Apply
+                  </Button>
+                </div>
+              </Card.Content>
+            </Card>
+          ))}
+        </Card.Group>
+        <Header style={{ textAlign: 'center' }} as="h3">
+          Devices
+        </Header>
+        <Card.Group centered>
+          {this.props.hostDeviceIds.map((id) => (
+            <Device
+              key={id}
+              hostId={this.props.activeHost}
+              tab="Hosts"
+              id={id}
+            />
+            ))}
+        </Card.Group>
+      </>
+    );
+  }
+}
+
+const mapStateToProps = (state, _) => ({
+  isActiveDefaultHost: state.active.activeHost === -1,
+  activeHost: state.active.activeHost,
+  hostScenes: state.hostScenes[state.active.activeHost] || [],
+  hostDevices: state.hostDevices,
+  hostDeviceIds: Object.keys(state.hostDevices[state.active.activeHost] || {}),
+});
+const HostsPanelContainer = connect(mapStateToProps, RemoteService)(HostsPanel);
+export default HostsPanelContainer;
diff --git a/smart-hut/src/components/dashboard/NewSceneDevice.js b/smart-hut/src/components/dashboard/NewSceneDevice.js
index cef04f9..c8a836c 100644
--- a/smart-hut/src/components/dashboard/NewSceneDevice.js
+++ b/smart-hut/src/components/dashboard/NewSceneDevice.js
@@ -1,9 +1,11 @@
-import React, { Component } from "react";
-import { Button, Modal, Icon, Image, Form, Dropdown } from "semantic-ui-react";
-import { connect } from "react-redux";
-import { RemoteService } from "../../remote";
-import styled from "styled-components";
-//import { appActions } from "../../storeActions";
+import React, { Component } from 'react';
+import {
+ Button, Modal, Icon, Image, Form, Dropdown,
+} from 'semantic-ui-react';
+import { connect } from 'react-redux';
+import styled from 'styled-components';
+import { RemoteService } from '../../remote';
+// import { appActions } from "../../storeActions";
 
 const StyledDiv = styled.div`
   background-color: #505bda;
@@ -31,27 +33,61 @@ class NewSceneDevice extends Component {
     this.state = {
       openModal: false,
       sceneDevices: this.props.scene ? this.props.scene.sceneStates : {},
-      deviceName: "",
+      deviceName: '',
+      availableDevices: [],
     };
     this.getDevices();
+    // this.getSceneStates();
+    this.availableDevices();
+    // console.log(this.state);
 
     this.setSceneState = this.setSceneState.bind(this);
     this.createState = this.createState.bind(this);
+    this.availableDevices = this.availableDevices.bind(this);
   }
 
   getDevices() {
     this.props
       .fetchDevices()
-      .catch((err) => console.error(`error fetching devices:`, err));
+      .catch((err) => console.error('error fetching devices:', err));
   }
 
+  // getSceneStates() {
+  //   this.props
+  //     .fetchStates(this.props.activeScene)
+  //     .catch((err) => console.error(`error fetching states`, err));
+  // }
+
   handleOpen = () => {
     this.setState({ openModal: true });
   };
+
   handleClose = () => {
     this.setState({ openModal: false });
   };
 
+  availableDevices() {
+    const availableDevices = [];
+    this.props.devices.forEach((e) => {
+      if (
+        Object.values(this.props.sceneStates).filter((d) => e.id === d.deviceId)
+          .length < 1
+      ) {
+        if (e.flowType === 'OUTPUT') {
+          availableDevices.push({
+            key: e.id,
+            text: e.name,
+            value: e.id,
+          });
+        }
+      } else {
+        // console.log("NOT FOUND", e);
+      }
+    });
+    this.setState({ availableDevices });
+    // return availableDevices;
+  }
+
   resetState = () => {
     this.setState(this.baseState);
     this.handleClose();
@@ -62,49 +98,46 @@ class NewSceneDevice extends Component {
   }
 
   createState() {
-    const device = this.props.devices.filter(
-      (e) => this.state.devicesAttached[0] === e.id
-    );
-    let data = {
-      sceneId: this.props.activeScene,
-      id: device[0].id,
-      kind: device[0].kind,
-    };
-    this.props
-      .saveState(data)
-      .catch((err) => console.error("error in creating state", err));
+    for (let i = 0; i < this.state.devicesAttached.length; i++) {
+      const device = this.props.devices.filter(
+        (e) => this.state.devicesAttached[i] === e.id,
+      );
+      const data = {
+        sceneId: this.props.activeScene,
+        id: device[0].id,
+        kind: device[0].kind,
+      };
+      this.props
+        .saveState(data)
+        .catch((err) => console.error('error in creating state', err));
+    }
     this.resetState();
   }
 
   render() {
-    const availableDevices = [];
-    this.props.devices.forEach((e) => {
-      if (!Object.keys(this.state.sceneDevices).find((d) => e.id === d)) {
-        if (e.flowType === "OUTPUT") {
-          availableDevices.push({
-            key: e.id,
-            text: e.name,
-            value: e.id,
-          });
-        }
-      }
-    });
     return (
       <Modal
         closeIcon
         open={this.state.openModal}
         onClose={this.resetState}
-        trigger={
-          <StyledDiv onClick={this.handleOpen}>
-            <Image src="/img/add.svg" style={{ filter: "invert()" }} />
+        trigger={(
+          <StyledDiv
+            onClick={this.handleOpen}
+            style={{
+              position: 'relative',
+              top: 'calc(50% - 5rem)',
+              left: 'calc(50% - 5rem)',
+            }}
+          >
+            <Image src="/img/add.svg" style={{ filter: 'invert()' }} />
           </StyledDiv>
-        }
-        centered={true}
+        )}
+        centered
       >
         <Modal.Header>Add a New Scene State</Modal.Header>
         <Modal.Content>
           <Form>
-            <Form.Field style={{ marginTop: "1rem" }}>
+            <Form.Field style={{ marginTop: '1rem' }}>
               <label>Select devices you want to attach: </label>
               <Dropdown
                 name="scene devices"
@@ -112,7 +145,8 @@ class NewSceneDevice extends Component {
                 fluid
                 multiple
                 onChange={this.setSceneState}
-                options={availableDevices}
+                onClick={() => this.availableDevices()}
+                options={this.state.availableDevices}
               />
             </Form.Field>
           </Form>
@@ -135,10 +169,20 @@ class NewSceneDevice extends Component {
 
 const mapStateToProps = (state, _) => ({
   devices: Object.values(state.devices),
+  get sceneStates() {
+    if (state.active.activeScene !== -1) {
+      const stateArray = [
+        ...state.scenes[state.active.activeScene].sceneStates,
+      ].sort();
+      console.log(state.scenes[state.active.activeScene]);
+      return stateArray.map((id) => state.sceneStates[id]);
+    }
+      return [];
+  },
   activeScene: state.active.activeScene,
 });
 const NewSceneDeviceContainer = connect(
   mapStateToProps,
-  RemoteService
+  RemoteService,
 )(NewSceneDevice);
 export default NewSceneDeviceContainer;
diff --git a/smart-hut/src/components/dashboard/ScenesPanel.js b/smart-hut/src/components/dashboard/ScenesPanel.js
index d8bcfd5..bc56238 100644
--- a/smart-hut/src/components/dashboard/ScenesPanel.js
+++ b/smart-hut/src/components/dashboard/ScenesPanel.js
@@ -1,9 +1,11 @@
-import React, { Component } from "react";
-import { connect } from "react-redux";
-import { RemoteService } from "../../remote";
-import Device from "./devices/Device";
-import NewSceneDevice from "./NewSceneDevice";
-import { Grid, Button } from "semantic-ui-react";
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import {
+ Button, Card, Segment, Header, Icon,
+} from 'semantic-ui-react';
+import { RemoteService } from '../../remote';
+import Device from './devices/Device';
+import NewSceneDevice from './NewSceneDevice';
 
 class ScenesPanel extends Component {
   constructor(props) {
@@ -12,39 +14,50 @@ class ScenesPanel extends Component {
   }
 
   applyScene() {
-    console.log(this.props.activeScene);
-    this.props.sceneApply(this.props.activeScene).then(() => {
-      alert("Scene applied.");
-    });
+    this.props
+      .sceneApply(this.props.activeScene)
+      .then(() => {
+        alert('Scene applied.');
+      })
+      .catch(console.error);
   }
 
   render() {
     return (
-      <Grid doubling columns={2} divided="vertically">
+      <Card.Group centered style={{ paddingTop: '3rem' }}>
         {!this.props.isActiveDefaultScene ? (
-          <Grid.Row centered>
-            <Button color="blue" onClick={this.applyScene}>
-              Apply Scene
-            </Button>
-          </Grid.Row>
-        ) : null}
-        {!this.props.isActiveDefaultScene
-          ? this.props.sceneStates.map((e, i) => {
-              return (
-                <Grid.Column key={i}>
-                  <Device tab={this.props.tab} id={e.id} />
-                </Grid.Column>
-              );
-            })
-          : null}
-        {!this.props.isActiveDefaultScene ? (
-          <Grid.Column>
-            <NewSceneDevice />
-          </Grid.Column>
+          <Card style={{ height: '27em' }}>
+            <Card.Content>
+              <Card.Header textAlign="center">
+                <Header as="h3">Add devices - Apply Scene</Header>
+              </Card.Header>
+              <Segment basic style={{ width: '100%', height: '100%' }}>
+                <NewSceneDevice states={this.props.sceneStates} />
+              </Segment>
+            </Card.Content>
+            <Card.Content extra>
+              <div className="ui two buttons">
+                <Button color="green" onClick={this.applyScene}>
+                  Apply Scene
+                </Button>
+              </div>
+            </Card.Content>
+          </Card>
         ) : (
-          <Grid.Column>Welcome to the Scene View, you add a Scene</Grid.Column>
+          <Segment placeholder>
+            <Header icon>
+              <Icon
+                name="exclamation triangle"
+                style={{ paddingBottom: '1rem' }}
+              />
+              Please select a scene on the left or add a new one.
+            </Header>
+          </Segment>
         )}
-      </Grid>
+        {!this.props.isActiveDefaultScene
+          ? this.props.sceneStates.map((e, i) => <Device key={i} tab={this.props.tab} id={e.id} />)
+          : null}
+      </Card.Group>
     );
   }
 }
@@ -55,11 +68,10 @@ const mapStateToProps = (state, _) => ({
       const stateArray = [
         ...state.scenes[state.active.activeScene].sceneStates,
       ].sort();
-      console.log("STATESCENE", stateArray);
+      console.log(state.scenes[state.active.activeScene]);
       return stateArray.map((id) => state.sceneStates[id]);
-    } else {
-      return [];
     }
+      return [];
   },
   get isActiveDefaultScene() {
     return state.active.activeScene === -1;
@@ -68,6 +80,6 @@ const mapStateToProps = (state, _) => ({
 });
 const ScenesPanelContainer = connect(
   mapStateToProps,
-  RemoteService
+  RemoteService,
 )(ScenesPanel);
 export default ScenesPanelContainer;
diff --git a/smart-hut/src/components/dashboard/devices/Curtain.js b/smart-hut/src/components/dashboard/devices/Curtain.js
index d475455..561edad 100644
--- a/smart-hut/src/components/dashboard/devices/Curtain.js
+++ b/smart-hut/src/components/dashboard/devices/Curtain.js
@@ -1,7 +1,8 @@
-import React, { Component } from "react";
-import "./Curtains.css";
-import { RemoteService } from "../../../remote";
-import { connect } from "react-redux";
+import React, { Component } from 'react';
+import './Curtains.css';
+import { connect } from 'react-redux';
+import { RemoteService } from '../../../remote';
+import mapStateToProps from '../../../deviceProps';
 
 class Curtain extends Component {
   constructor(props) {
@@ -14,7 +15,7 @@ class Curtain extends Component {
     this.setIntensity = this.setIntensity.bind(this);
   }
 
-  //getters
+  // getters
   get turnedOn() {
     return this.props.stateOrDevice.on;
   }
@@ -25,14 +26,14 @@ class Curtain extends Component {
 
   onClickDevice = () => {
     const on = !this.turnedOn;
-    if (this.props.tab === "Devices") {
+    if (this.props.tab === 'Devices') {
       this.props
         .saveDevice({ ...this.props.stateOrDevice, on })
-        .catch((err) => console.error("curtains update error", err));
+        .catch((err) => console.error('curtains update error', err));
     } else {
       this.props.updateState(
-        { id: this.props.stateOrDevice.id, on: on },
-        this.props.stateOrDevice.kind
+        { id: this.props.stateOrDevice.id, on },
+        this.props.stateOrDevice.kind,
       );
     }
   };
@@ -58,14 +59,14 @@ class Curtain extends Component {
 
   saveIntensity = () => {
     const intensity = Math.round(this.state.intensity);
-    if (this.props.tab === "Devices") {
+    if (this.props.tab === 'Devices') {
       this.props
         .saveDevice({ ...this.props.stateOrDevice, intensity })
-        .catch((err) => console.error("curtain update error", err));
+        .catch((err) => console.error('curtain update error', err));
     } else {
       this.props.updateState(
-        { id: this.props.stateOrDevice.id, intensity: intensity },
-        this.props.stateOrDevice.kind
+        { id: this.props.stateOrDevice.id, intensity },
+        this.props.stateOrDevice.kind,
       );
     }
   };
@@ -80,7 +81,7 @@ class Curtain extends Component {
     }
   };
 
-  ///*this took me way too much more time than it should have*/
+  // /*this took me way too much more time than it should have*/
 
   handleChange = (a) => {
     this.setIntensity(a.target.value / 100);
@@ -93,13 +94,16 @@ class Curtain extends Component {
         <div
           className="open-container"
           style={{
-            height: (9 * this.props.stateOrDevice.intensity) / 100 + "rem",
+            height: `${(9 * this.props.stateOrDevice.intensity) / 100}rem`,
           }}
-        ></div>{" "}
+        />
+        {' '}
         <span className="span-open">
-          {Math.round(this.props.stateOrDevice.intensity)}%
+          {Math.round(this.props.stateOrDevice.intensity)}
+%
         </span>
         <input
+          disabled={this.props.disabled}
           onChange={this.handleChange}
           value={this.props.stateOrDevice.intensity}
           className="slider"
@@ -112,15 +116,5 @@ class Curtain extends Component {
   }
 }
 
-const mapStateToProps = (state, ownProps) => ({
-  get stateOrDevice() {
-    if (state.active.activeTab === "Devices") {
-      return state.devices[ownProps.id];
-    } else {
-      return state.sceneStates[ownProps.id];
-    }
-  },
-  //device: state.devices[ownProps.id],
-});
 const CurtainContainer = connect(mapStateToProps, RemoteService)(Curtain);
 export default CurtainContainer;
diff --git a/smart-hut/src/components/dashboard/devices/Curtains.css b/smart-hut/src/components/dashboard/devices/Curtains.css
index e98e37f..73b74b9 100644
--- a/smart-hut/src/components/dashboard/devices/Curtains.css
+++ b/smart-hut/src/components/dashboard/devices/Curtains.css
@@ -1,69 +1,69 @@
 * {
-    margin: 0;
-    padding: 0;
-    box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
 }
 
 .container.curtain-container {
-    position: relative;
-    margin-top: 10%;
-    width: 18rem;
-    height: 9rem;
-    background-color: #f7f7f7;
-    border-radius: 5px;
-    box-shadow: 10px 10px 30px 15px rgba(0, 0, 0, 0.247);
+  position: relative;
+  margin-top: 10%;
+  width: 18rem;
+  height: 9rem;
+  background-color: #f7f7f7;
+  border-radius: 5px;
+  box-shadow: 10px 10px 30px 15px rgba(0, 0, 0, 0.247);
 }
 
 .open-container {
-    position: absolute;
-    width: 18rem;
-    background-color: #f79071;
-    border-radius: 5px;
+  position: absolute;
+  width: 18rem;
+  background-color: #f79071;
+  border-radius: 5px;
 }
 
 .slider {
-    -webkit-appearance: none;
-    width: 9rem;
-    position: absolute;
-    left: 75%;
-    top: 50%;
-    transform: translateY(-50%) rotateZ(90deg);
-    background: transparent;
-    outline: none;
+  -webkit-appearance: none;
+  width: 9rem;
+  position: absolute;
+  left: 75%;
+  top: 50%;
+  transform: translateY(-50%) rotateZ(90deg);
+  background: transparent;
+  outline: none;
 }
 
 .slider::-webkit-slider-runnable-track {
-    -webkit-appearance: none;
-    height: 5px;
-    background-color: #1b1c1d;
-    border-radius: 50px;
-    cursor: pointer;
+  -webkit-appearance: none;
+  height: 5px;
+  background-color: #1b1c1d;
+  border-radius: 50px;
+  cursor: pointer;
 }
 
 .slider::-webkit-slider-thumb {
-    -webkit-appearance: none;
-    appearance: none;
-    width: 18px;
-    height: 18px;
-    border-radius: 50%;
-    background: #1b1c1d;
-    position: relative;
-    transition: all;
-    top: -5.5px;
+  -webkit-appearance: none;
+  appearance: none;
+  width: 18px;
+  height: 18px;
+  border-radius: 50%;
+  background: #1b1c1d;
+  position: relative;
+  transition: all;
+  top: -5.5px;
 }
 
 .slider::-webkit-slider-thumb:hover {
-    transform: scale(1.2);
+  transform: scale(1.2);
 }
 
 .span-open {
-    -webkit-user-select: none;
-    font-family: "Lato";
-    font-weight: bold;
-    font-size: 3rem;
-    text-emphasis: none;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
+  -webkit-user-select: none;
+  font-family: "Lato", Sans-serif;
+  font-weight: bold;
+  font-size: 3rem;
+  text-emphasis: none;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
 }
diff --git a/smart-hut/src/components/dashboard/devices/Device.js b/smart-hut/src/components/dashboard/devices/Device.js
index 43efc7f..218cb53 100644
--- a/smart-hut/src/components/dashboard/devices/Device.js
+++ b/smart-hut/src/components/dashboard/devices/Device.js
@@ -1,16 +1,26 @@
-import React from "react";
-import Light from "./Light";
-import SmartPlug from "./SmartPlug";
-import Sensor from "./Sensor";
-import { ButtonDimmer, KnobDimmer } from "./Dimmer";
-import Switcher from "./Switch";
-import Videocam from "./Videocam";
-import Curtains from "./Curtain";
-import Thermostat from "./Thermostats";
-import { Segment, Grid, Header, Button, Icon } from "semantic-ui-react";
-import { RemoteService } from "../../../remote";
-import { connect } from "react-redux";
-import DeviceSettingsModal from "./DeviceSettingsModal";
+import React from 'react';
+import {
+ Header, Button, Icon, Card,
+} from 'semantic-ui-react';
+import { connect } from 'react-redux';
+import Light from './Light';
+import SmartPlug from './SmartPlug';
+import Sensor from './Sensor';
+import { ButtonDimmer, KnobDimmer } from './Dimmer';
+import Switcher from './Switch';
+import Videocam from './Videocam';
+import Curtains from './Curtain';
+import Thermostat from './Thermostats';
+import { RemoteService } from '../../../remote';
+import DeviceSettingsModal from './DeviceSettingsModal';
+import mapStateToProps from '../../../deviceProps';
+
+const centerComponent = {
+  marginLeft: '50%',
+  transform: 'translateX(-50%)',
+  marginTop: '10%',
+  marginBottom: '10%',
+};
 
 class Device extends React.Component {
   constructor(props) {
@@ -23,204 +33,126 @@ class Device extends React.Component {
   }
 
   edit() {
-    console.log("editing device with id=" + this.props.id);
+    console.log(`editing device with id=${this.props.id}`);
     this.modalRef.current.openModal();
   }
 
   resetSmartPlug() {
     this.props
       .smartPlugReset(this.props.id)
-      .catch((err) => console.error(`Smart plug reset error`, err));
+      .catch((err) => console.error('Smart plug reset error', err));
   }
 
   deleteState() {
-    //console.log("alpaca "+this.props);
-    this.props.deleteState(this.props.id, this.props.type);
+    this.props.deleteState(this.props.id, this.props.stateOrDevice.kind);
   }
 
   renderDeviceComponent() {
-    switch (
-      this.props.tab === "Devices"
-        ? this.props.stateOrDevice.kind
-        : this.props.type
-    ) {
-      case "curtains":
-        return (
-          <Curtains
-            tab={this.props.tab}
-            sceneState={this.props.sceneState}
-            id={this.props.id}
-          />
-        );
-      case "thermostat":
-        return (
-          <Thermostat
-            tab={this.props.tab}
-            sceneState={this.props.sceneStat}
-            id={this.props.stateOrDevice.id}
-          />
-        );
-      case "regularLight":
-        return (
-          <Light
-            tab={this.props.tab}
-            sceneState={this.props.sceneState}
-            id={this.props.stateOrDevice.id}
-          />
-        );
-      case "sensor":
-        return (
-          <Sensor
-            tab={this.props.tab}
-            sceneState={this.props.sceneState}
-            id={this.props.stateOrDevice.id}
-          />
-        );
-      case "motionSensor":
-        return <Sensor tab={this.props.tab} id={this.props.stateOrDevice.id} />;
-      case "buttonDimmer":
-        return (
-          <ButtonDimmer tab={this.props.tab} id={this.props.stateOrDevice.id} />
-        );
-      case "knobDimmer":
-        return (
-          <KnobDimmer tab={this.props.tab} id={this.props.stateOrDevice.id} />
-        );
-      case "smartPlug":
-        return (
-          <SmartPlug tab={this.props.tab} id={this.props.stateOrDevice.id} />
-        );
-      case "switch":
-        return (
-          <Switcher tab={this.props.tab} id={this.props.stateOrDevice.id} />
-        );
-      case "dimmableLight":
-        return <Light id={this.props.stateOrDevice.id} tab={this.props.tab} />;
-      case "securityCamera":
-        return (
-          <Videocam id={this.props.stateOrDevice.id} tab={this.props.tab} />
-        );
-      default:
-        //throw new Error("Device type unknown");
-        return undefined;
+    const mapKindToComponent = {
+      curtains: Curtains,
+      thermostat: Thermostat,
+      regularLight: Light,
+      sensor: Sensor,
+      motionSensor: Sensor,
+      buttonDimmer: ButtonDimmer,
+      knobDimmer: KnobDimmer,
+      smartPlug: SmartPlug,
+      switch: Switcher,
+      dimmableLight: Light,
+      securityCamera: Videocam,
+    };
+
+    if (!(this.props.type in mapKindToComponent)) {
+      throw new Error(`device kind ${this.props.type} not known`);
     }
+
+    return React.createElement(
+      mapKindToComponent[this.props.type],
+      {
+        tab: this.props.tab,
+        id: this.props.id,
+        hostId: this.props.hostId,
+      },
+      '',
+    );
+  }
+
+  deviceDescription() {
+    return (
+      <div className="ui two buttons">
+        <Button color="blue" icon onClick={this.edit} labelPosition="left">
+          <Icon name="pencil" />
+          Edit
+        </Button>
+        {this.props.stateOrDevice.kind === 'smartPlug' ? (
+          <Button
+            color="orange"
+            icon
+            onClick={this.resetSmartPlug}
+            labelPosition="left"
+          >
+            <Icon name="undo" />
+            Reset
+          </Button>
+        ) : null}
+      </div>
+    );
+  }
+
+  stateDescription() {
+    return (
+      <div className="ui two buttons">
+        <Button
+          color="red"
+          icon
+          onClick={this.deleteState}
+          labelPosition="left"
+        >
+          <Icon name="trash alternate" />
+          Delete
+        </Button>
+      </div>
+    );
+  }
+
+  get deviceName() {
+    return this.props.device.name;
   }
 
   render() {
-    {
-      if (this.props.type !== "") {
-        return (
-          <Segment>
-            <Grid columns={2}>
-              <Grid.Column>{this.renderDeviceComponent()}</Grid.Column>
-              {this.props.tab === "Devices" ? (
-                <Grid.Column textAlign="center">
-                  <Header as="h3">{this.props.stateOrDevice.name}</Header>
-                  <Button
-                    color="blue"
-                    icon
-                    onClick={this.edit}
-                    labelPosition="left"
-                  >
-                    <Icon name="pencil" />
-                    Edit
-                  </Button>
-                  {this.props.stateOrDevice.kind === "smartPlug" ? (
-                    <Button
-                      color="orange"
-                      icon
-                      onClick={this.resetSmartPlug}
-                      labelPosition="left"
-                    >
-                      <Icon name="undo" />
-                      Reset
-                    </Button>
-                  ) : null}
-                </Grid.Column>
-              ) : (
-                <Grid.Column textAlign="center">
-                  <Header as="h3">{this.props.device.name}</Header>
-                  {this.props.tab === "Scenes" ? (
-                    <Header as="h4">{this.props.roomName}</Header>
-                  ) : (
-                    ""
-                  )}
-                  <Button
-                    color="red"
-                    icon
-                    onClick={this.deleteState}
-                    labelPosition="left"
-                  >
-                    <Icon name="undo" />
-                    Delete
-                  </Button>
-                </Grid.Column>
-              )}
-            </Grid>
-            {this.props.stateOrDevice && this.props.tab === "Devices" ? (
-              <DeviceSettingsModal
-                ref={this.modalRef}
-                id={this.props.stateOrDevice.id}
-              />
-            ) : (
-              ""
-            )}
-          </Segment>
-        );
-      } else {
-        return null;
-      }
-    }
+    return (
+      <Card style={{ height: '27em' }}>
+        <Card.Content>
+          <Card.Header textAlign="center">
+            <Header as="h3">{this.deviceName}</Header>
+            <Header as="h4" style={{ marginTop: '.5rem' }}>
+              {this.props.roomName}
+            </Header>
+          </Card.Header>
+
+          <Card.Description
+            style={
+              this.props.device.kind !== 'curtains' ? centerComponent : null
+            }
+          >
+            {this.renderDeviceComponent()}
+          </Card.Description>
+        </Card.Content>
+        <Card.Content extra>
+          {this.props.tab === 'Devices'
+            ? this.deviceDescription()
+            : this.props.tab === 'Scenes' && this.stateDescription()}
+        </Card.Content>
+        {this.props.tab === 'Devices' ? (
+          <DeviceSettingsModal
+            ref={this.modalRef}
+            id={this.props.stateOrDevice.id}
+          />
+        ) : null}
+      </Card>
+    );
   }
 }
-/*
 
-{this.props.stateOrDevice ? 
-                        <DeviceSettingsModal
-                        ref={this.modalRef}
-                        id={this.props.stateOrDevice.id}
-                        /> :
-                        ""
-                    }
-*/
-const mapStateToProps = (state, ownProps) => ({
-  get stateOrDevice() {
-    if (state.active.activeTab === "Devices") {
-      return state.devices[ownProps.id];
-    } else {
-      return state.sceneStates[ownProps.id];
-    }
-  },
-  get device() {
-    if (state.active.activeTab === "Devices") {
-      return state.devices[ownProps.id];
-    } else {
-      return state.devices[state.sceneStates[ownProps.id].deviceId];
-    }
-  },
-  get roomName() {
-    if (state.active.activeTab === "Scenes") {
-      const device = state.devices[state.sceneStates[ownProps.id].deviceId];
-      return state.rooms[device.roomId].name;
-    } else {
-      return "";
-    }
-  },
-  get type() {
-    console.log("ALPACA", state, ownProps);
-    if (state.active.activeTab === "Scenes") {
-      if (state.sceneStates[ownProps.id]) {
-        //console.log(state.sceneStates[ownProps.id], ownProps.id);
-        const id = state.sceneStates[ownProps.id].deviceId;
-        //console.log(id, state.devices[id].kind);
-        return state.devices[id].kind;
-      } else {
-        return "";
-      }
-    } else {
-      return null;
-    }
-  },
-});
 const DeviceContainer = connect(mapStateToProps, RemoteService)(Device);
 export default DeviceContainer;
diff --git a/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js b/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
index 162e242..b1d25fe 100644
--- a/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
+++ b/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
@@ -1,25 +1,31 @@
-import React, { Component, useState } from "react";
-import { Button, Form, Icon, Header, Modal, Input } from "semantic-ui-react";
-import { connect } from "react-redux";
-import { RemoteService } from "../../../remote";
+import React, { Component, useState } from 'react';
+import {
+ Button, Form, Icon, Header, Modal, Input,
+} from 'semantic-ui-react';
+import { connect } from 'react-redux';
+import { RemoteService } from '../../../remote';
 
 const DeleteModal = (props) => (
   <Modal
-    trigger={
+    trigger={(
       <Button icon labelPosition="left" inverted color="red">
         <Icon name="trash alternate" />
         Delete device
       </Button>
-    }
+    )}
     closeIcon
   >
     <Header icon="archive" content="Are you sure ?" />
     <Modal.Actions>
       <Button color="red">
-        <Icon name="remove" /> No
+        <Icon name="remove" />
+        {' '}
+No
       </Button>
       <Button onClick={() => props.removeDevice()} color="green">
-        <Icon name="checkmark" /> Yes
+        <Icon name="checkmark" />
+        {' '}
+Yes
       </Button>
     </Modal.Actions>
   </Modal>
@@ -31,7 +37,7 @@ const SettingsForm = (props) => {
     setValues({ ...values, [name]: value });
   };
 
-  const [values, setValues] = useState({ name: "" });
+  const [values, setValues] = useState({ name: '' });
 
   return (
     <Form>
@@ -42,10 +48,8 @@ const SettingsForm = (props) => {
           name="name"
           onChange={handleInputChange}
           placeholder={props.name}
-          // {this.props.device.name}
         />
       </Form.Field>
-
       <Form.Field>
         <DeleteModal removeDevice={() => props.removeDevice(values)} />
       </Form.Field>
@@ -71,6 +75,7 @@ class DeviceSettingsModal extends Component {
 
     this.updateDevice = this.updateDevice.bind(this);
     this.deleteDevice = this.deleteDevice.bind(this);
+    // this.useExternalTempSensor = this.useExternalTempSensor.bind(this);
   }
 
   closeModal = (e) => {
@@ -82,44 +87,68 @@ class DeviceSettingsModal extends Component {
   };
 
   updateDevice(values) {
-    if (values.name.length === 0) return;
+    console.log(values, this.external);
+    let { name } = values;
+    if (values.name.length === 0) {
+      name = this.props.device.name;
+    }
+
+    const data = {
+      ...this.props.device,
+      name,
+    };
+
+    if (this.props.device.kind === 'thermostat') {
+      const external = values.external
+        ? values.external
+        : this.props.device.useExternalSensors;
+      console.log(external);
+      data.useExternalSensors = external;
+    }
+    console.log(data.useExternalSensors);
     this.props
-      .saveDevice({ ...this.props.device, name: values.name })
+      .saveDevice(data)
       .then(() => this.setState({ openModal: false }))
-      .catch((err) =>
-        console.error(
+      .catch((err) => console.error(
           `settings modal for device ${this.props.id} deletion error`,
-          err
-        )
-      );
+          err,
+        ));
   }
 
   deleteDevice() {
     this.props
       .deleteDevice(this.props.device)
-      .then(() => this.setState({ open: false }))
-      .catch((err) =>
-        console.error(
+      .then(() => this.setState({ openModal: false }))
+      .catch((err) => console.error(
           `settings modal for device ${this.props.id} deletion error`,
-          err
-        )
-      );
+          err,
+        ));
+  }
+
+  _editForm = null;
+
+  get editForm() {
+    this._editForm = this._editForm || (
+      <SettingsForm
+        name={this.state.name}
+        removeDevice={this.deleteDevice}
+        saveFunction={this.updateDevice}
+        tempSensor={this.useExternalTempSensor}
+      />
+    );
+    return this._editForm;
   }
 
   render() {
-    const SettingsModal = () => (
+    return (
       <Modal closeIcon onClose={this.closeModal} open={this.state.openModal}>
-        <Modal.Header>Settings of {this.props.device.name}</Modal.Header>
-        <Modal.Content>
-          <SettingsForm
-            name={this.state.name}
-            removeDevice={this.deleteDevice}
-            saveFunction={this.updateDevice}
-          />
-        </Modal.Content>
+        <Modal.Header>
+Settings of
+          {this.props.device.name}
+        </Modal.Header>
+        <Modal.Content>{this.editForm}</Modal.Content>
       </Modal>
     );
-    return <SettingsModal />;
   }
 }
 
@@ -130,6 +159,6 @@ const DeviceSettingsModalContainer = connect(
   mapStateToProps,
   RemoteService,
   null,
-  { forwardRef: true }
+  { forwardRef: true },
 )(DeviceSettingsModal);
 export default DeviceSettingsModalContainer;
diff --git a/smart-hut/src/components/dashboard/devices/Dimmer.js b/smart-hut/src/components/dashboard/devices/Dimmer.js
index e9d7a72..f8652db 100644
--- a/smart-hut/src/components/dashboard/devices/Dimmer.js
+++ b/smart-hut/src/components/dashboard/devices/Dimmer.js
@@ -5,20 +5,21 @@
  • A dimmer without state can just increase or decrease the intensity of a light. <-- DefualtDimmer
 
  The user can change the state of a dimmer through an intuitive UI in SmartHut .
- **/
+ * */
 
-import React, { Component } from "react";
+import React, { Component } from 'react';
 import {
   CircularInput,
   CircularProgress,
   CircularThumb,
-} from "react-circular-input";
+} from 'react-circular-input';
+import { connect } from 'react-redux';
 import {
   ButtonDimmerContainer,
   MinusPanel,
   PlusPanel,
   ThumbText,
-} from "./styleComponents";
+} from './styleComponents';
 import {
   CircularThumbStyle,
   KnobDimmerStyle,
@@ -26,21 +27,21 @@ import {
   textStyle,
   knobIcon,
   knobContainer,
-} from "./DimmerStyle";
-import { RemoteService } from "../../../remote";
-import { connect } from "react-redux";
+} from './DimmerStyle';
+import { RemoteService } from '../../../remote';
+import mapStateToProps from '../../../deviceProps';
 
 export class ButtonDimmerComponent extends Component {
   increaseIntensity = () => {
     this.props
-      .buttonDimmerDim(this.props.id, "UP")
-      .catch((err) => console.error("button dimmer increase error", err));
+      .buttonDimmerDim(this.props.id, 'UP')
+      .catch((err) => console.error('button dimmer increase error', err));
   };
 
   decreaseIntensity = () => {
     this.props
-      .buttonDimmerDim(this.props.id, "DOWN")
-      .catch((err) => console.error("button dimmer decrease error", err));
+      .buttonDimmerDim(this.props.id, 'DOWN')
+      .catch((err) => console.error('button dimmer decrease error', err));
   };
 
   render() {
@@ -95,7 +96,7 @@ export class KnobDimmerComponent extends Component {
     const val = Math.round(this.state.intensity);
     this.props
       .knobDimmerDimTo(this.props.id, val)
-      .catch((err) => console.error("knob dimmer set intensity error", err));
+      .catch((err) => console.error('knob dimmer set intensity error', err));
   }
 
   render() {
@@ -103,8 +104,8 @@ export class KnobDimmerComponent extends Component {
       <div style={knobContainer}>
         <CircularInput
           style={KnobDimmerStyle}
-          value={+(Math.round(this.state.intensity / 100 + "e+2") + "e-2")}
-          onChange={this.setIntensity}
+          value={+(`${Math.round(`${this.state.intensity / 100}e+2`)}e-2`)}
+          onChange={this.props.disabled ? null : this.setIntensity}
         >
           <text
             style={textStyle}
@@ -120,7 +121,7 @@ export class KnobDimmerComponent extends Component {
             style={{ ...KnobProgress, opacity: this.state.intensity + 0.1 }}
           />
           <CircularThumb style={CircularThumbStyle} />
-          <ThumbText color={"#1a2849"} />
+          <ThumbText color="#1a2849" />
         </CircularInput>
         <img alt="Knob Icon" style={knobIcon} src="/img/knobDimmer.svg" />
       </div>
@@ -128,15 +129,6 @@ export class KnobDimmerComponent extends Component {
   }
 }
 
-const mapStateToProps = (state, ownProps) => ({
-  get stateOrDevice(){
-    if(state.active.activeTab==="Devices"){
-      return state.devices[ownProps.id];
-    }else{
-      return state.sceneStates[ownProps.id];
-    }
-  },
-});
 const conn = connect(mapStateToProps, RemoteService);
 
 export const KnobDimmer = conn(KnobDimmerComponent);
diff --git a/smart-hut/src/components/dashboard/devices/DimmerStyle.js b/smart-hut/src/components/dashboard/devices/DimmerStyle.js
index cdc6216..25e8f2b 100644
--- a/smart-hut/src/components/dashboard/devices/DimmerStyle.js
+++ b/smart-hut/src/components/dashboard/devices/DimmerStyle.js
@@ -1,70 +1,72 @@
 export const KnobDimmerStyle = {
-  cursor: "pointer",
-  marginTop: "1rem",
-  width: "9rem",
-  height: "9rem",
-  fill: "#1a2849",
+  cursor: 'pointer',
+  marginTop: '1rem',
+  width: '9rem',
+  height: '9rem',
+  fill: '#1a2849',
 };
 
 export const KnobHolder = {
-  marginTop: "1rem",
-  cursor: "pointer",
-  padding: "3rem",
-  backgroundColor: "white",
-  width: "10rem",
-  height: "10rem",
+  marginTop: '1rem',
+  cursor: 'pointer',
+  padding: '3rem',
+  backgroundColor: 'white',
+  width: '10rem',
+  height: '10rem',
 };
 
 export const KnobCircularTrack = {
-  fill: "white",
-  stroke: "#1a2849",
+  fill: 'white',
+  stroke: '#1a2849',
 };
 
 export const KnobIcon = {
-  fill: "#1a2849",
+  fill: '#1a2849',
 };
 
 export const KnobProgress = {
-  stroke: "#1a2849",
-  strokeWidth: "3rem",
+  stroke: '#1a2849',
+  strokeWidth: '3rem',
 };
 
 export const ValueStyle = {
-  pointerEvents: "none",
-  fill: "#1a2849",
-  fontSize: "1.3rem",
-  fontFamily: "Lato",
-  textAnchor: "middle",
+  pointerEvents: 'none',
+  fill: '#1a2849',
+  fontSize: '1.3rem',
+  fontFamily: 'Lato',
+  textAnchor: 'middle',
+  userSelect: 'none',
 };
 
 export const CircularThumbStyle = {
-  fill: "white",
-  stroke: "#1a2849",
-  strokeWidth: ".2rem",
-  r: "1.4rem",
+  fill: 'white',
+  stroke: '#1a2849',
+  strokeWidth: '.2rem',
+  r: '1.4rem',
 };
 
 export const textStyle = {
-  position: "absolute",
-  fill: "#1a2849",
-  fontSize: "1.5rem",
-  fontFamily: "Lato",
-  overflow: "hidden",
-  whiteSpace: "nowrap",
-  textOverflow: "ellipsis",
+  position: 'absolute',
+  fill: '#1a2849',
+  fontSize: '1.5rem',
+  fontFamily: 'Lato',
+  overflow: 'hidden',
+  whiteSpace: 'nowrap',
+  textOverflow: 'ellipsis',
+  userSelect: 'none',
 };
 
 export const knobIcon = {
-  position: "absolute",
-  left: "50%",
-  top: "30%",
-  transform: "translateX(-50%)",
-  width: "2rem",
-  height: "2rem",
+  position: 'absolute',
+  left: '50%',
+  top: '30%',
+  transform: 'translateX(-50%)',
+  width: '2rem',
+  height: '2rem',
 };
 
 export const knobContainer = {
-  position: "relative",
-  width: "9rem",
-  height: "9rem",
+  position: 'relative',
+  width: '9rem',
+  height: '9rem',
 };
diff --git a/smart-hut/src/components/dashboard/devices/Light.js b/smart-hut/src/components/dashboard/devices/Light.js
index 54af2e7..919b167 100644
--- a/smart-hut/src/components/dashboard/devices/Light.js
+++ b/smart-hut/src/components/dashboard/devices/Light.js
@@ -7,19 +7,20 @@
  * Lights have an internal state that can be changed and it must
  * be shown accordingly in the SmartHut views (house view and room views).
  */
-import React, { Component } from "react";
+import React, { Component } from 'react';
+import { Image } from 'semantic-ui-react';
+import {
+  CircularInput,
+  CircularProgress,
+  CircularThumb,
+} from 'react-circular-input';
+import { connect } from 'react-redux';
 import {
   iconStyle,
   StyledDiv,
   BottomPanel,
   ThumbText,
-} from "./styleComponents";
-import { Image } from "semantic-ui-react";
-import {
-  CircularInput,
-  CircularProgress,
-  CircularThumb,
-} from "react-circular-input";
+} from './styleComponents';
 import {
   LightDimmerContainer,
   LightDimmerStyle,
@@ -28,9 +29,9 @@ import {
   KnobProgress,
   CircularThumbStyle,
   knobIcon,
-} from "./LightStyle";
-import { RemoteService } from "../../../remote";
-import { connect } from "react-redux";
+} from './LightStyle';
+import { RemoteService } from '../../../remote';
+import mapStateToProps from '../../../deviceProps';
 
 class Light extends Component {
   constructor(props) {
@@ -40,13 +41,13 @@ class Light extends Component {
       timeout: null,
     };
 
-    this.iconOn = "/img/lightOn.svg";
-    this.iconOff = "/img/lightOff.svg";
+    this.iconOn = '/img/lightOn.svg';
+    this.iconOff = '/img/lightOff.svg';
 
     this.setIntensity = this.setIntensity.bind(this);
   }
 
-  componentDidUpdate(prevProps, prevState) {
+  componentDidUpdate(prevProps) {
     if (
       this.props.stateOrDevice.intensity !== prevProps.stateOrDevice.intensity
     ) {
@@ -62,36 +63,35 @@ class Light extends Component {
   }
 
   get intensity() {
-    return this.props.stateOrDevice.intensity || 0;
+    return this.state.intensity || 0;
   }
 
   onClickDevice = () => {
     const on = !this.turnedOn;
-    if (this.props.tab === "Devices") {
+    if (this.props.tab !== 'Scenes') {
       this.props
-        .saveDevice({ ...this.props.stateOrDevice, on })
-        .catch((err) => console.error("regular light update error", err));
-    } else {
-      if (this.props.device.kind === "regularLight") {
+        .saveDevice(
+          { ...this.props.stateOrDevice, on },
+          this.props.tab === 'Hosts' ? this.props.activeHost : null,
+        )
+        .catch((err) => console.error('regular light update error', err));
+    } else if (this.props.device.kind === 'regularLight') {
         this.props
           .updateState(
             {
               id: this.props.stateOrDevice.id,
-              on: on,
+              on,
               sceneId: this.props.stateOrDevice.sceneId,
             },
-            this.props.stateOrDevice.kind
+            this.props.stateOrDevice.kind,
           )
           .then((res) => {
             console.log(res);
           });
       }
-    }
   };
 
-  getIcon = () => {
-    return this.turnedOn ? this.iconOn : this.iconOff;
-  };
+  getIcon = () => (this.turnedOn ? this.iconOn : this.iconOff);
 
   setIntensity(intensity) {
     intensity *= 100;
@@ -114,16 +114,18 @@ class Light extends Component {
 
   saveIntensity = () => {
     const intensity = Math.round(this.state.intensity);
-    if (this.props.tab === "Devices") {
+    if (this.props.tab !== 'Scenes') {
       this.props
-        .saveDevice({ ...this.props.stateOrDevice, intensity })
-        .catch((err) => console.error("regular light update error", err));
+        .saveDevice(
+          { ...this.props.stateOrDevice, intensity },
+          this.props.tab === 'Hosts' ? this.props.activeHost : null,
+        )
+        .catch((err) => console.error('dimmable light update error', err));
     } else {
-      console.log("CIAOOOOOOOOO", this.props.stateOrDevice);
       this.props
         .updateState(
-          { id: this.props.stateOrDevice.id, intensity: intensity },
-          this.props.stateOrDevice.kind
+          { id: this.props.stateOrDevice.id, intensity },
+          this.props.stateOrDevice.kind,
         )
         .then((res) => {
           console.log(res, this.props.stateOrDevice.kind);
@@ -136,9 +138,9 @@ class Light extends Component {
       <div style={LightDimmerContainer}>
         <CircularInput
           style={LightDimmerStyle}
-          value={+(Math.round(this.state.intensity / 100 + "e+2") + "e-2")}
-          onChange={this.setIntensity}
-          onMouseUp={this.saveIntensity}
+          value={+(`${Math.round(`${this.intensity / 100}e+2`)}e-2`)}
+          onChange={this.props.disabled ? null : this.setIntensity}
+          onMouseUp={this.props.disabled ? null : this.saveIntensity}
         >
           <text
             style={textStyle}
@@ -153,21 +155,21 @@ class Light extends Component {
           <CircularProgress
             style={{
               ...KnobProgress,
-              opacity: this.state.intensity / 100 + 0.3,
+              opacity: this.intensity / 100 + 0.3,
             }}
           />
           <CircularThumb style={CircularThumbStyle} />
-          <ThumbText color={"#ffd31d"} />
+          <ThumbText color="#ffd31d" />
         </CircularInput>
         <Image style={knobIcon} src="/img/intensityLightIcon.svg" />
       </div>
     );
 
     const normalLightView = (
-      <StyledDiv>
-        <div onClick={this.onClickDevice}>
+      <StyledDiv onClick={this.onClickDevice}>
+        <div>
           <Image src={this.getIcon()} style={iconStyle} />
-          <BottomPanel style={{ backgroundColor: "#ffa41b" }}>
+          <BottomPanel style={{ backgroundColor: '#ffa41b' }}>
             <h5 style={nameStyle}>Light</h5>
           </BottomPanel>
         </div>
@@ -176,7 +178,7 @@ class Light extends Component {
 
     return (
       <div>
-        {this.props.device.kind === "dimmableLight"
+        {this.props.device.kind === 'dimmableLight'
           ? intensityLightView
           : normalLightView}
       </div>
@@ -184,22 +186,5 @@ class Light extends Component {
   }
 }
 
-const mapStateToProps = (state, ownProps) => ({
-  get stateOrDevice() {
-    if (state.active.activeTab === "Devices") {
-      return state.devices[ownProps.id];
-    } else {
-      return state.sceneStates[ownProps.id];
-    }
-  },
-  get device() {
-    if (state.active.activeTab === "Devices") {
-      return state.devices[ownProps.id];
-    } else {
-      return state.devices[state.sceneStates[ownProps.id].deviceId];
-    }
-  },
-});
-
 const LightContainer = connect(mapStateToProps, RemoteService)(Light);
 export default LightContainer;
diff --git a/smart-hut/src/components/dashboard/devices/LightStyle.js b/smart-hut/src/components/dashboard/devices/LightStyle.js
index 35577cd..d6b33d6 100644
--- a/smart-hut/src/components/dashboard/devices/LightStyle.js
+++ b/smart-hut/src/components/dashboard/devices/LightStyle.js
@@ -1,67 +1,69 @@
 export const valueStyle = {
-  fill: "#3e99ff",
-  fontSize: "2.5rem",
-  fontFamily: "Lato",
-  textShadow: "1px 1px 0.5px rgba(0, 0, 0, .2)",
+  fill: '#3e99ff',
+  fontSize: '2.5rem',
+  fontFamily: 'Lato',
+  textShadow: '1px 1px 0.5px rgba(0, 0, 0, .2)',
 };
 
 export const intensityLightStyle = {
-  fill: "#ffd31d",
-  fontSize: "1.2rem",
-  fontFamily: "Lato",
-  textShadow: "1px 1px 0.5px rgba(0, 0, 0, .2)",
+  fill: '#ffd31d',
+  fontSize: '1.2rem',
+  fontFamily: 'Lato',
+  textShadow: '1px 1px 0.5px rgba(0, 0, 0, .2)',
 };
 
 export const textStyle = {
-  position: "absolute",
-  fill: "#ffd31d",
-  fontSize: "1.5rem",
-  fontFamily: "Lato",
-  overflow: "hidden",
-  whiteSpace: "nowrap",
-  textOverflow: "ellipsis",
+  position: 'absolute',
+  fill: '#ffd31d',
+  fontSize: '1.5rem',
+  fontFamily: 'Lato',
+  overflow: 'hidden',
+  whiteSpace: 'nowrap',
+  textOverflow: 'ellipsis',
+  userSelect: 'none',
 };
 
 export const nameStyle = {
-  fontSize: "1rem",
-  position: "absolute",
-  top: "30%",
-  left: "50%",
-  transform: "translateX(-50%)",
-  color: "white",
+  fontSize: '1rem',
+  position: 'absolute',
+  top: '30%',
+  left: '50%',
+  transform: 'translateX(-50%)',
+  color: 'white',
+  userSelect: 'none',
 };
 
 export const LightDimmerStyle = {
-  cursor: "pointer",
-  marginTop: "1rem",
-  width: "9rem",
-  height: "9rem",
-  fill: "#ffd31d",
+  cursor: 'pointer',
+  marginTop: '1rem',
+  width: '9rem',
+  height: '9rem',
+  fill: '#ffd31d',
 };
 
 export const LightDimmerContainer = {
-  position: "relative",
-  width: "9rem",
-  height: "9rem",
+  position: 'relative',
+  width: '9rem',
+  height: '9rem',
 };
 
 export const CircularThumbStyle = {
-  fill: "white",
-  stroke: "#ffd31d",
-  strokeWidth: ".2rem",
-  r: "1.4rem",
+  fill: 'white',
+  stroke: '#ffd31d',
+  strokeWidth: '.2rem',
+  r: '1.4rem',
 };
 
 export const KnobProgress = {
-  stroke: "#ffd31d",
-  strokeWidth: "3rem",
+  stroke: '#ffd31d',
+  strokeWidth: '3rem',
 };
 
 export const knobIcon = {
-  position: "absolute",
-  left: "50%",
-  top: "30%",
-  transform: "translateX(-50%)",
-  width: "2rem",
-  height: "2rem",
+  position: 'absolute',
+  left: '50%',
+  top: '30%',
+  transform: 'translateX(-50%)',
+  width: '2rem',
+  height: '2rem',
 };
diff --git a/smart-hut/src/components/dashboard/devices/NewDevice.js b/smart-hut/src/components/dashboard/devices/NewDevice.js
index 7897c9e..2002750 100644
--- a/smart-hut/src/components/dashboard/devices/NewDevice.js
+++ b/smart-hut/src/components/dashboard/devices/NewDevice.js
@@ -1,5 +1,5 @@
-import React, { Component } from "react";
-import styled from "styled-components";
+import React, { Component } from 'react';
+import styled from 'styled-components';
 import {
   Button,
   Dropdown,
@@ -8,9 +8,9 @@ import {
   Image,
   Input,
   Modal,
-} from "semantic-ui-react";
-import { RemoteService } from "../../../remote";
-import { connect } from "react-redux";
+} from 'semantic-ui-react';
+import { connect } from 'react-redux';
+import { RemoteService } from '../../../remote';
 
 const StyledDiv = styled.div`
   background-color: #505bda;
@@ -38,7 +38,7 @@ class NewDevice extends Component {
       step: 1,
       openModal: false,
       motion: false,
-      deviceName: "",
+      deviceName: '',
     };
     this.baseState = this.state;
     this.createDevice = this.createDevice.bind(this);
@@ -47,6 +47,7 @@ class NewDevice extends Component {
   handleOpen = () => {
     this.setState({ openModal: true });
   };
+
   handleClose = () => {
     this.setState({ openModal: false });
   };
@@ -59,12 +60,13 @@ class NewDevice extends Component {
   nextStep = () => {
     this.setState((prevState) => ({ step: prevState.step + 1 }));
   };
+
   previousStep = () => {
     this.setState((prevState) => ({ step: prevState.step - 1 }));
   };
 
   setTypeOfDevice = (e, d) => {
-    if (d.value === "dimmableLight") {
+    if (d.value === 'dimmableLight') {
       this.setState({ typeOfDevice: d.value, intensity: 0 });
     } else {
       this.setState({ typeOfDevice: d.value });
@@ -77,7 +79,7 @@ class NewDevice extends Component {
 
   setTypeOfSensor = (e, d) => {
     console.log(d.value);
-    if (d.value === "motionSensor") {
+    if (d.value === 'motionSensor') {
       this.setState({ typeOfSensor: d.value, motion: true });
     } else {
       this.setState({ typeOfSensor: d.value });
@@ -94,155 +96,176 @@ class NewDevice extends Component {
       id: null,
       roomId: this.props.activeRoom,
       name: this.state.deviceName,
-      kind: this.state.motion ? "motionSensor" : this.state.typeOfDevice,
+      kind: this.state.motion ? 'motionSensor' : this.state.typeOfDevice,
     };
     let outputs = null;
 
     const defaultNames = {
-      regularLight: "New regular light",
-      dimmableLight: "New intensity light",
-      smartPlug: "New smart Plug",
-      sensor: "New sensor",
-      switch: "New switch",
-      buttonDimmer: "New button dimmer",
-      knobDimmer: "New knob dimmer",
-      securityCamera: "New security camera",
+      regularLight: 'New regular light',
+      dimmableLight: 'New intensity light',
+      smartPlug: 'New smart Plug',
+      sensor: 'New sensor',
+      switch: 'New switch',
+      buttonDimmer: 'New button dimmer',
+      knobDimmer: 'New knob dimmer',
+      securityCamera: 'New security camera',
+      thermostat: 'New thermostat',
+      curtains: 'New curtains',
     };
 
-    if (this.state.deviceName === "") {
+    if (this.state.deviceName === '') {
       data.name = defaultNames[this.state.typeOfDevice];
     }
-    console.log("-------------------------");
+    console.log('-------------------------');
     console.log(this.state.typeOfDevice);
 
     switch (this.state.typeOfDevice) {
-      //trying to make securityCamera work
-      //case "securityCamera":
+      // trying to make securityCamera work
+      // case "securityCamera":
       // data.path="/security_camera_videos/security_camera_1.mp4";
       // data.on=false;
-      //break;
-      //trying to make thermostat work
-      case "thermostat":
+      // break;
+      // trying to make thermostat work
+      case 'thermostat':
         data.targetTemperature = 0;
         data.measuredTemperature = 0;
         break;
-      case "dimmableLight":
+      case 'dimmableLight':
         data.intensity = 0;
         break;
-      case "sensor":
+      case 'sensor':
         if (!this.state.motion) {
           data.sensor = this.state.typeOfSensor;
           data.value = 0;
         }
         break;
-      case "switch":
-      case "buttonDimmer":
-      case "knobDimmer":
+      case 'switch':
+      case 'buttonDimmer':
+      case 'knobDimmer':
         outputs = this.state.lightsAttached;
+        if (
+          this.state.lightsAttached === undefined
+          || this.state.lightsAttached.length === 0
+        ) {
+          alert(
+            'No lights attached to this switch! Please, add a light a first.',
+          );
+          return;
+        }
         break;
       default:
         break;
     }
 
     try {
-      let newDevice = await this.props.saveDevice(data);
+      const newDevice = await this.props.saveDevice(data);
       if (outputs) {
         await this.props.connectOutputs(newDevice, outputs);
       }
       this.resetState();
     } catch (e) {
-      console.error("device creation error: ", e);
+      console.error('device creation error: ', e);
     }
   }
 
   render() {
     const deviceOptions = [
-      //stuff
-      { key: "thermostat", text: "Thermostat", value: "thermostat", image: {} },
-      { key: "curtains", text: "Curtain", value: "curtains", image: {} },
-      //stuff ends
+      // stuff
       {
-        key: "light",
-        text: "Normal Light",
-        value: "regularLight",
-        image: { avatar: true, src: "/img/lightOn.svg" },
+        key: 'thermostat',
+        text: 'Thermostat',
+        value: 'thermostat',
+        image: { avatar: true, src: '/img/thermostat-icon.png' },
       },
       {
-        key: "intensity-light",
-        text: "Intensity Light",
-        value: "dimmableLight",
-        image: { avatar: true, src: "/img/intensity-light.svg" },
+        key: 'curtains',
+        text: 'Curtain',
+        value: 'curtains',
+        image: { avatar: true, src: '/img/curtains-icon.png' },
+      },
+      // stuff ends
+      {
+        key: 'light',
+        text: 'Normal Light',
+        value: 'regularLight',
+        image: { avatar: true, src: '/img/lightOn.svg' },
       },
       {
-        key: "smart-plug",
-        text: "Smart Plug",
-        value: "smartPlug",
-        image: { avatar: true, src: "/img/smart-plug.svg" },
+        key: 'intensity-light',
+        text: 'Intensity Light',
+        value: 'dimmableLight',
+        image: { avatar: true, src: '/img/intensity-light.svg' },
       },
       {
-        key: "sensor",
-        text: "Sensor",
-        value: "sensor",
-        image: { avatar: true, src: "/img/sensorOn.svg" },
+        key: 'smart-plug',
+        text: 'Smart Plug',
+        value: 'smartPlug',
+        image: { avatar: true, src: '/img/smart-plug.svg' },
       },
       {
-        key: "switch",
-        text: "Switch",
-        value: "switch",
-        image: { avatar: true, src: "/img/switchOn.svg" },
+        key: 'sensor',
+        text: 'Sensor',
+        value: 'sensor',
+        image: { avatar: true, src: '/img/sensorOn.svg' },
       },
       {
-        key: "knobDimmer",
-        text: "Knob Dimmer",
-        value: "knobDimmer",
-        image: { avatar: true, src: "/img/knob.svg" },
+        key: 'switch',
+        text: 'Switch',
+        value: 'switch',
+        image: { avatar: true, src: '/img/switchOn.svg' },
       },
       {
-        key: "buttonDimmer",
-        text: "Button Dimmer",
-        value: "buttonDimmer",
-        image: { avatar: true, src: "/img/plusMinus.svg" },
+        key: 'knobDimmer',
+        text: 'Knob Dimmer',
+        value: 'knobDimmer',
+        image: { avatar: true, src: '/img/knob.svg' },
       },
       {
-        key: "securityCamera",
-        text: "Security Camera",
-        value: "securityCamera",
-        image: { avatar: true, src: "/img/plusMinus.svg" },
+        key: 'buttonDimmer',
+        text: 'Button Dimmer',
+        value: 'buttonDimmer',
+        image: { avatar: true, src: '/img/plusMinus.svg' },
+      },
+      {
+        key: 'securityCamera',
+        text: 'Security Camera',
+        value: 'securityCamera',
+        image: { avatar: true, src: '/img/security-icon.png' },
       },
     ];
     const sensorOptions = [
       {
-        key: "temperature",
-        text: "Temperature Sensor",
-        value: "TEMPERATURE",
-        image: { avatar: true, src: "/img/temperature-sensor.svg" },
+        key: 'temperature',
+        text: 'Temperature Sensor',
+        value: 'TEMPERATURE',
+        image: { avatar: true, src: '/img/temperature-sensor.svg' },
       },
       {
-        key: "humidity",
-        text: "Humidity Sensor",
-        value: "HUMIDITY",
-        image: { avatar: true, src: "/img/humidity-sensor.svg" },
+        key: 'humidity',
+        text: 'Humidity Sensor',
+        value: 'HUMIDITY',
+        image: { avatar: true, src: '/img/humidity-sensor.svg' },
       },
       {
-        key: "light",
-        text: "Light Sensor",
-        value: "LIGHT",
-        image: { avatar: true, src: "/img/light-sensor.svg" },
+        key: 'light',
+        text: 'Light Sensor',
+        value: 'LIGHT',
+        image: { avatar: true, src: '/img/light-sensor.svg' },
       },
       {
-        key: "motion",
-        text: "Motion Sensor",
-        value: "motionSensor",
-        image: { avatar: true, src: "/img/sensorOn.svg" },
+        key: 'motion',
+        text: 'Motion Sensor',
+        value: 'motionSensor',
+        image: { avatar: true, src: '/img/sensorOn.svg' },
       },
     ];
     const availableSwitchDevices = [];
     const availableDimmerDevices = [];
     this.props.devices.forEach((d) => {
       if (
-        d.kind === "regularLight" ||
-        d.kind === "dimmableLight" ||
-        d.kind === "smartPlug"
+        d.kind === 'regularLight'
+        || d.kind === 'dimmableLight'
+        || d.kind === 'smartPlug'
       ) {
         availableSwitchDevices.push({
           key: d.id,
@@ -250,7 +273,7 @@ class NewDevice extends Component {
           value: d.id,
         });
       }
-      if (d.kind === "dimmableLight") {
+      if (d.kind === 'dimmableLight') {
         availableDimmerDevices.push({
           key: d.id,
           text: d.name,
@@ -275,7 +298,7 @@ class NewDevice extends Component {
             <label>Device Name: </label>
             <Input
               fluid
-              size={"large"}
+              size="large"
               onChange={this.setDeviceName}
               focus
               placeholder="Device Name"
@@ -284,7 +307,7 @@ class NewDevice extends Component {
         </div>
       );
       const sensorForm = (
-        <Form.Field style={{ marginTop: "1rem" }}>
+        <Form.Field style={{ marginTop: '1rem' }}>
           <label>Type of Sensor: </label>
           <Dropdown
             name="typeOfDevice"
@@ -297,7 +320,7 @@ class NewDevice extends Component {
         </Form.Field>
       );
       const switchOptions = (
-        <Form.Field style={{ marginTop: "1rem" }}>
+        <Form.Field style={{ marginTop: '1rem' }}>
           <label>Select the lights or smart plugs You Want to Attach: </label>
           <Dropdown
             name="typeOfDevice"
@@ -310,7 +333,7 @@ class NewDevice extends Component {
         </Form.Field>
       );
       const dimmerOptions = (
-        <Form.Field style={{ marginTop: "1rem" }}>
+        <Form.Field style={{ marginTop: '1rem' }}>
           <label>Select the dimmable lights You Want to Attach: </label>
           <Dropdown
             name="typeOfDevice"
@@ -325,12 +348,12 @@ class NewDevice extends Component {
       return (
         <Form>
           {deviceName}
-          {this.state.typeOfDevice === "sensor" ? sensorForm : ""}
-          {this.state.typeOfDevice === "switch" ? switchOptions : ""}
-          {this.state.typeOfDevice === "buttonDimmer" ||
-          this.state.typeOfDevice === "knobDimmer"
+          {this.state.typeOfDevice === 'sensor' ? sensorForm : ''}
+          {this.state.typeOfDevice === 'switch' ? switchOptions : ''}
+          {this.state.typeOfDevice === 'buttonDimmer'
+          || this.state.typeOfDevice === 'knobDimmer'
             ? dimmerOptions
-            : ""}
+            : ''}
         </Form>
       );
     };
@@ -340,12 +363,19 @@ class NewDevice extends Component {
         closeIcon
         open={this.state.openModal}
         onClose={this.resetState}
-        trigger={
-          <StyledDiv onClick={this.handleOpen}>
-            <Image src="/img/add.svg" style={{ filter: "invert()" }} />
+        trigger={(
+          <StyledDiv
+            onClick={this.handleOpen}
+            style={{
+              position: 'relative',
+              top: 'calc(50% - 5rem)',
+              left: 'calc(50% - 5rem)',
+            }}
+          >
+            <Image src="/img/add.svg" style={{ filter: 'invert()' }} />
           </StyledDiv>
-        }
-        centered={true}
+        )}
+        centered
       >
         <Modal.Header>Add a New Device</Modal.Header>
         <Modal.Content>{steps[this.state.step - 1]}</Modal.Content>
@@ -361,7 +391,7 @@ class NewDevice extends Component {
               Back
             </Button>
           ) : (
-            ""
+            ''
           )}
           {this.state.step < steps.length ? (
             <Button
@@ -374,7 +404,7 @@ class NewDevice extends Component {
               <Icon name="right arrow" />
             </Button>
           ) : (
-            ""
+            ''
           )}
           {this.state.step === steps.length ? (
             <Button
@@ -387,7 +417,7 @@ class NewDevice extends Component {
               Finish
             </Button>
           ) : (
-            ""
+            ''
           )}
         </Modal.Actions>
       </Modal>
diff --git a/smart-hut/src/components/dashboard/devices/Sensor.js b/smart-hut/src/components/dashboard/devices/Sensor.js
index ad80a4c..8350116 100644
--- a/smart-hut/src/components/dashboard/devices/Sensor.js
+++ b/smart-hut/src/components/dashboard/devices/Sensor.js
@@ -19,8 +19,10 @@
   errorStyle,
  */
 
-import React, { Component } from "react";
-import { CircularInput, CircularProgress } from "react-circular-input";
+import React, { Component } from 'react';
+import { CircularInput, CircularProgress } from 'react-circular-input';
+import { Image } from 'semantic-ui-react';
+import { connect } from 'react-redux';
 import {
   container,
   sensorText,
@@ -34,10 +36,9 @@ import {
   lightSensorColors,
   humiditySensorColors,
   iconSensorStyle,
-} from "./SensorStyle";
-import { Image } from "semantic-ui-react";
-import { RemoteService } from "../../../remote";
-import { connect } from "react-redux";
+} from './SensorStyle';
+import { RemoteService } from '../../../remote';
+import mapStateToProps from '../../../deviceProps';
 
 class Sensor extends Component {
   constructor(props) {
@@ -46,32 +47,25 @@ class Sensor extends Component {
       value: 0,
       motion: false,
     };
-    this.units = "";
+    this.units = '';
     this.stateCallback = (e) => {
       this.setState(Object.assign(this.state, e));
     };
 
     this.colors = temperatureSensorColors;
-    this.icon = "temperatureIcon.svg";
-    this.name = "Sensor";
+    this.icon = 'temperatureIcon.svg';
+    this.name = 'Sensor';
   }
 
-  // setName = () => {
-  //   if (this.props.device.name.length > 15) {
-  //     return this.props.device.name.slice(0, 12) + "...";
-  //   }
-  //   return this.props.device.name;
-  // };
-
   componentDidUpdate(prevProps) {
     if (
-      this.props.stateOrDevice.kind === "sensor" &&
-      this.props.stateOrDevice.value !== prevProps.stateOrDevice.value
+      this.props.stateOrDevice.kind === 'sensor'
+      && this.props.stateOrDevice.value !== prevProps.stateOrDevice.value
     ) {
       this.setState({ value: this.props.stateOrDevice.value });
     } else if (
-      this.props.stateOrDevice.kind === "motionSensor" &&
-      this.props.stateOrDevice.detected !== prevProps.stateOrDevice.detected
+      this.props.stateOrDevice.kind === 'motionSensor'
+      && this.props.stateOrDevice.detected !== prevProps.stateOrDevice.detected
     ) {
       this.setState({
         motion: true,
@@ -81,28 +75,28 @@ class Sensor extends Component {
   }
 
   componentDidMount() {
-    if (this.props.stateOrDevice.kind === "sensor") {
+    if (this.props.stateOrDevice.kind === 'sensor') {
       switch (this.props.stateOrDevice.sensor) {
-        case "TEMPERATURE":
-          this.units = "ºC";
+        case 'TEMPERATURE':
+          this.units = 'ºC';
           this.colors = temperatureSensorColors;
-          this.icon = "temperatureIcon.svg";
-          this.name = "Temperature Sensor";
+          this.icon = 'temperatureIcon.svg';
+          this.name = 'Temperature Sensor';
           break;
-        case "HUMIDITY":
-          this.units = "%";
+        case 'HUMIDITY':
+          this.units = '%';
           this.colors = humiditySensorColors;
-          this.icon = "humidityIcon.svg";
-          this.name = "Humidity Sensor";
+          this.icon = 'humidityIcon.svg';
+          this.name = 'Humidity Sensor';
           break;
-        case "LIGHT":
-          this.units = "lm";
+        case 'LIGHT':
+          this.units = 'lm';
           this.colors = lightSensorColors;
-          this.icon = "lightSensorIcon.svg";
-          this.name = "Light Sensor";
+          this.icon = 'lightSensorIcon.svg';
+          this.name = 'Light Sensor';
           break;
         default:
-          this.units = "";
+          this.units = '';
       }
       this.setState({
         value: this.props.stateOrDevice.value,
@@ -122,37 +116,47 @@ class Sensor extends Component {
     return this.iconOff;
   };
 
+  temperatureColor = (value) => {
+    let hue = 100;
+    const min = 16;
+    const max = 20;
+    if (value >= min && value < max) {
+      hue = 100 - ((value - min) * 100) / (max - min);
+    } else if (value >= max) {
+      hue = 0;
+    }
+    return `hsl(${hue}, 100%, 50%)`;
+  };
+
   render() {
-    const MotionSensor = (props) => {
-      return (
+    const MotionSensor = (props) => (
+      <div
+        style={{
+            ...motionSensorOuterCircle,
+            backgroundColor: this.state.detected ? '#505bda' : '#00bdaa',
+          }}
+      >
         <div
           style={{
-            ...motionSensorOuterCircle,
-            backgroundColor: this.state.detected ? "#505bda" : "#00bdaa",
-          }}
-        >
-          <div
-            style={{
               ...motionSensorInnerCircle,
-              backgroundColor: this.state.detected ? "#fe346e" : "#00bdaa",
+              backgroundColor: this.state.detected ? '#fe346e' : '#00bdaa',
             }}
-          >
-            <Image style={motionSensorIcon} src="/img/motionSensorIcon.svg" />
-            <span style={nameMotionStyle}>Motion Sensor</span>
-          </div>
+        >
+          <Image style={motionSensorIcon} src="/img/motionSensorIcon.svg" />
+          <span style={nameMotionStyle}>Motion Sensor</span>
         </div>
+      </div>
       );
-    };
 
     return (
       <div style={container}>
         {this.state.motion ? (
           <MotionSensor />
         ) : (
-          <React.Fragment>
+          <>
             <CircularInput
               value={
-                this.props.stateOrDevice.sensor === "LIGHT"
+                this.props.stateOrDevice.sensor === 'LIGHT'
                   ? this.state.value / 2000
                   : this.state.value / 100
               }
@@ -160,11 +164,18 @@ class Sensor extends Component {
             >
               <CircularProgress
                 strokeWidth="2rem"
-                stroke={this.colors.progress}
+                stroke={
+                  this.props.stateOrDevice.sensor === 'TEMPERATURE'
+                    ? this.temperatureColor(this.state.value)
+                    : this.colors.progress
+                }
                 fill={this.colors.circle}
               />
               <text
-                style={{ ...valueStyle, fill: this.colors.text }}
+                style={{
+                  ...valueStyle,
+                  fill: this.colors.text,
+                }}
                 x={100}
                 y={110}
                 textAnchor="middle"
@@ -172,11 +183,14 @@ class Sensor extends Component {
                 fontWeight="bold"
                 fill={this.colors.text}
               >
-                {+(Math.round(this.state.value + "e+2") + "e-2")}
+                {+(`${Math.round(`${this.state.value}e+2`)}e-2`)}
                 {this.units}
               </text>
               <text
-                style={{ ...sensorText, fill: this.colors.text }}
+                style={{
+                  ...sensorText,
+                  fill: this.colors.text,
+                }}
                 x={100}
                 y={150}
                 textAnchor="middle"
@@ -187,21 +201,12 @@ class Sensor extends Component {
               </text>
             </CircularInput>
             <Image style={iconSensorStyle} src={`/img/${this.icon}`} />
-          </React.Fragment>
+          </>
         )}
       </div>
     );
   }
 }
 
-const mapStateToProps = (state, ownProps) => ({
-  get stateOrDevice() {
-    if (state.active.activeTab === "Devices") {
-      return state.devices[ownProps.id];
-    } else {
-      return state.sceneStates[ownProps.id];
-    }
-  },
-});
 const SensorContainer = connect(mapStateToProps, RemoteService)(Sensor);
 export default SensorContainer;
diff --git a/smart-hut/src/components/dashboard/devices/SensorStyle.js b/smart-hut/src/components/dashboard/devices/SensorStyle.js
index c07927c..bb03ad2 100644
--- a/smart-hut/src/components/dashboard/devices/SensorStyle.js
+++ b/smart-hut/src/components/dashboard/devices/SensorStyle.js
@@ -1,105 +1,108 @@
 export const style = {
-  width: "10rem",
-  height: "10rem",
-  position: "absolute",
-  top: "0",
-  left: "0",
+  width: '10rem',
+  height: '10rem',
+  position: 'absolute',
+  top: '0',
+  left: '0',
 };
 
 export const container = {
-  width: "10rem",
-  height: "10rem",
-  borderRadius: "100%",
-  border: "none",
-  position: "relative",
+  width: '10rem',
+  height: '10rem',
+  borderRadius: '100%',
+  border: 'none',
+  position: 'relative',
 };
 
 export const sensorText = {
-  fill: "#3e99ff",
-  fontSize: "1.2rem",
-  fontFamily: "Lato",
-  overflow: "hidden",
-  whiteSpace: "nowrap",
-  textOverflow: "ellipsis",
+  fill: '#3e99ff',
+  fontSize: '1.2rem',
+  fontFamily: 'Lato',
+  overflow: 'hidden',
+  whiteSpace: 'nowrap',
+  textOverflow: 'ellipsis',
+  userSelect: 'none',
 };
 
 export const valueStyle = {
-  fill: "#3e99ff",
-  fontSize: "2.4rem",
-  fontFamily: "Lato",
+  fill: '#3e99ff',
+  fontSize: '2.4rem',
+  fontFamily: 'Lato',
+  userSelect: 'none',
 };
 
 export const errorStyle = {
-  fill: "#ff4050",
-  fontSize: "1.5rem",
-  fontFamily: "Lato",
-  textShadow: "1px 1px 0.5px rgba(0, 0, 0, .2)",
+  fill: '#ff4050',
+  fontSize: '1.5rem',
+  fontFamily: 'Lato',
+  textShadow: '1px 1px 0.5px rgba(0, 0, 0, .2)',
+  userSelect: 'none',
 };
 
 export const motionSensorInnerCircle = {
-  position: "absolute",
-  top: "50%",
-  left: "50%",
-  transform: "translate(-50%, -50%)",
-  width: "8rem",
-  height: "8rem",
-  borderRadius: "100%",
-  border: "none",
+  position: 'absolute',
+  top: '50%',
+  left: '50%',
+  transform: 'translate(-50%, -50%)',
+  width: '8rem',
+  height: '8rem',
+  borderRadius: '100%',
+  border: 'none',
 };
 
 export const motionSensorOuterCircle = {
-  textAlign: "center",
-  cursor: "pointer",
-  position: "relative",
-  width: "10rem",
-  height: "10rem",
-  borderRadius: "100%",
-  border: "none",
-  /*boxShadow: "3px 2px 10px 5px #ccc",*/
+  textAlign: 'center',
+  cursor: 'pointer',
+  position: 'relative',
+  width: '10rem',
+  height: '10rem',
+  borderRadius: '100%',
+  border: 'none',
+  /* boxShadow: "3px 2px 10px 5px #ccc", */
 };
 
 export const nameMotionStyle = {
-  position: "absolute",
-  top: "50%",
-  left: "50%",
-  transform: "translateX(-50%)",
-  fontSize: "1.2rem",
-  overflow: "hidden",
-  whiteSpace: "nowrap",
-  textOverflow: "ellipsis",
+  position: 'absolute',
+  top: '50%',
+  left: '50%',
+  transform: 'translateX(-50%)',
+  fontSize: '1.2rem',
+  overflow: 'hidden',
+  whiteSpace: 'nowrap',
+  textOverflow: 'ellipsis',
 };
 
 export const motionSensorIcon = {
-  width: "2rem",
-  height: "2rem",
-  position: "absolute",
-  top: "15%",
-  left: "50%",
-  transform: "translateX(-50%)",
+  width: '2rem',
+  height: '2rem',
+  position: 'absolute',
+  top: '15%',
+  left: '50%',
+  transform: 'translateX(-50%)',
 };
 export const temperatureSensorColors = {
-  circle: "#323232",
-  progress: "#ff1e56",
-  text: "white",
+  circle: '#323232',
+  progress: '#ff1e56',
+  text: 'white',
 };
 
 export const lightSensorColors = {
-  circle: "#000839",
-  progress: "#ffa41b",
-  text: "white",
+  circle: '#000839',
+  progress: '#ffa41b',
+  text: 'white',
 };
 
 export const humiditySensorColors = {
-  circle: "#005082",
-  progress: "#00a8cc",
-  text: "white",
+  circle: '#005082',
+  progress: '#00a8cc',
+  text: 'white',
 };
 
 export const iconSensorStyle = {
-  position: "absolute",
-  top: "20%",
-  left: "50%",
-  transform: "translateX(-50%)",
-  width: "2rem",
-  height: "2rem",
+  position: 'absolute',
+  top: '20%',
+  left: '50%',
+  transform: 'translateX(-50%)',
+  width: '2rem',
+  height: '2rem',
 };
diff --git a/smart-hut/src/components/dashboard/devices/SmartPlug.js b/smart-hut/src/components/dashboard/devices/SmartPlug.js
index c14773c..e2b8e84 100644
--- a/smart-hut/src/components/dashboard/devices/SmartPlug.js
+++ b/smart-hut/src/components/dashboard/devices/SmartPlug.js
@@ -3,24 +3,25 @@
  SmartHut interface or by a switch.
  The smart plug also stores the total energy consumed while the plug is active, in terms of kilowatt-hours 2(kWh) .
  The user can reset this value.
- **/
-import React, { Component } from "react";
-import { BottomPanel, StyledDiv } from "./styleComponents";
-import { Image } from "semantic-ui-react";
+ * */
+import React, { Component } from 'react';
+import { Image } from 'semantic-ui-react';
+import { connect } from 'react-redux';
+import { BottomPanel, StyledDiv } from './styleComponents';
 import {
   energyConsumedStyle,
   imageStyle,
   kwhStyle,
   nameStyle,
-} from "./SmartPlugStyle";
-import { RemoteService } from "../../../remote";
-import { connect } from "react-redux";
+} from './SmartPlugStyle';
+import { RemoteService } from '../../../remote';
+import mapStateToProps from '../../../deviceProps';
 
 class SmartPlug extends Component {
   constructor(props) {
     super(props);
-    this.iconOn = "/img/smart-plug.svg";
-    this.iconOff = "/img/smart-plug-off.svg";
+    this.iconOn = '/img/smart-plug.svg';
+    this.iconOff = '/img/smart-plug-off.svg';
   }
 
   get turnedOn() {
@@ -28,38 +29,36 @@ class SmartPlug extends Component {
   }
 
   get energyConsumed() {
-    return (this.props.stateOrDevice.totalConsumption / 1000).toFixed(3);
+    return (this.props.device.totalConsumption / 1000).toFixed(3);
   }
 
   onClickDevice = () => {
     const on = !this.turnedOn;
-    if (this.props.tab === "Devices") {
+    if (this.props.tab === 'Devices') {
       this.props
         .saveDevice({ ...this.props.stateOrDevice, on })
-        .catch((err) => console.error("smart plug update error", err));
+        .catch((err) => console.error('smart plug update error', err));
     } else {
       this.props.updateState(
-        { id: this.props.stateOrDevice.id, on: on },
-        this.props.stateOrDevice.kind
+        { id: this.props.stateOrDevice.id, on },
+        this.props.stateOrDevice.kind,
       );
     }
   };
 
-  getIcon = () => {
-    return this.turnedOn ? this.iconOn : this.iconOff;
-  };
+  getIcon = () => (this.turnedOn ? this.iconOn : this.iconOff);
 
   render() {
     return (
-      <StyledDiv onClick={this.onClickDevice}>
+      <StyledDiv onClick={this.props.disabled ? () => {} : this.onClickDevice}>
         <Image src={this.getIcon()} style={imageStyle} />
         <span style={nameStyle}>Smart Plug</span>
 
         <BottomPanel
           style={
             this.turnedOn
-              ? { backgroundColor: "#505bda" }
-              : { backgroundColor: "#1a2849" }
+              ? { backgroundColor: '#505bda' }
+              : { backgroundColor: '#1a2849' }
           }
         >
           <span style={energyConsumedStyle}>{this.energyConsumed}</span>
@@ -70,14 +69,5 @@ class SmartPlug extends Component {
   }
 }
 
-const mapStateToProps = (state, ownProps) => ({
-  get stateOrDevice() {
-    if (state.active.activeTab === "Devices") {
-      return state.devices[ownProps.id];
-    } else {
-      return state.sceneStates[ownProps.id];
-    }
-  },
-});
 const SmartPlugContainer = connect(mapStateToProps, RemoteService)(SmartPlug);
 export default SmartPlugContainer;
diff --git a/smart-hut/src/components/dashboard/devices/SmartPlugStyle.js b/smart-hut/src/components/dashboard/devices/SmartPlugStyle.js
index 41fe567..4db970b 100644
--- a/smart-hut/src/components/dashboard/devices/SmartPlugStyle.js
+++ b/smart-hut/src/components/dashboard/devices/SmartPlugStyle.js
@@ -1,38 +1,42 @@
 export const energyConsumedStyle = {
-  color: "white",
-  fontSize: "1.3rem",
-  position: "absolute",
-  top: "20%",
-  left: "50%",
-  transform: "translateX(-50%)",
+  color: 'white',
+  fontSize: '1.3rem',
+  position: 'absolute',
+  top: '20%',
+  left: '50%',
+  transform: 'translateX(-50%)',
+  userSelect: 'none',
 };
 
 export const kwhStyle = {
-  color: "white",
-  fontSize: "1rem",
-  position: "absolute",
-  top: "50%",
-  left: "50%",
-  transform: "translateX(-50%)",
+  color: 'white',
+  fontSize: '1rem',
+  position: 'absolute',
+  top: '50%',
+  left: '50%',
+  transform: 'translateX(-50%)',
+  userSelect: 'none',
 };
 
 export const imageStyle = {
-  width: "2rem",
-  height: "auto",
-  position: "absolute",
-  top: "5%",
-  left: "50%",
-  transform: "translateX(-35%)",
-  filter: "drop-shadow( 1px 1px 0.5px rgba(0, 0, 0, .25))",
+  width: '2rem',
+  height: 'auto',
+  position: 'absolute',
+  top: '5%',
+  left: '50%',
+  transform: 'translateX(-35%)',
+  filter: 'drop-shadow( 1px 1px 0.5px rgba(0, 0, 0, .25))',
+  userSelect: 'none',
 };
 
 export const nameStyle = {
-  color: "black",
-  position: "absolute",
-  top: "30%",
-  left: "50%",
-  transform: "translateX(-50%)",
-  overflow: "hidden",
-  whiteSpace: "nowrap",
-  textOverflow: "ellipsis",
+  color: 'black',
+  position: 'absolute',
+  top: '30%',
+  left: '50%',
+  transform: 'translateX(-50%)',
+  overflow: 'hidden',
+  whiteSpace: 'nowrap',
+  textOverflow: 'ellipsis',
+  userSelect: 'none',
 };
diff --git a/smart-hut/src/components/dashboard/devices/Switch.js b/smart-hut/src/components/dashboard/devices/Switch.js
index 113c1f1..9bce3db 100644
--- a/smart-hut/src/components/dashboard/devices/Switch.js
+++ b/smart-hut/src/components/dashboard/devices/Switch.js
@@ -5,58 +5,54 @@
  * The user can change the state of a switch through the SmartHut interface.
  */
 
-import React, { Component } from "react";
-import { BottomPanel, StyledDiv } from "./styleComponents";
-import { Image } from "semantic-ui-react";
-import { imageStyle, nameStyle, turnedOnStyle } from "./SwitchStyle";
-import { RemoteService } from "../../../remote";
-import { connect } from "react-redux";
+import React, { Component } from 'react';
+import { Image } from 'semantic-ui-react';
+import { connect } from 'react-redux';
+import { BottomPanel, StyledDiv } from './styleComponents';
+import { imageStyle, nameStyle, turnedOnStyle } from './SwitchStyle';
+import { RemoteService } from '../../../remote';
+import mapStateToProps from '../../../deviceProps';
 
 class Switch extends Component {
   constructor(props) {
     super(props);
-    this.iconOn = "/img/switchOn.svg";
-    this.iconOff = "/img/switchOff.svg";
+    this.iconOn = '/img/switchOn.svg';
+    this.iconOff = '/img/switchOff.svg';
   }
 
   get turnedOn() {
     return this.props.device.on;
   }
 
-  getIcon = () => {
-    return this.turnedOn ? this.iconOn : this.iconOff;
-  };
+  getIcon = () => (this.turnedOn ? this.iconOn : this.iconOff);
 
   onClickDevice = () => {
     const newOn = !this.turnedOn;
-    const type = newOn ? "ON" : "OFF";
+    const type = newOn ? 'ON' : 'OFF';
     this.props
       .switchOperate(this.props.id, type)
-      .catch((err) => console.error("switch operate failed", err));
+      .catch((err) => console.error('switch operate failed', err));
   };
 
   render() {
     return (
-      <StyledDiv onClick={this.onClickDevice}>
+      <StyledDiv onClick={this.props.disabled ? () => {} : this.onClickDevice}>
         <Image src={this.getIcon()} style={imageStyle} />
         <span style={nameStyle}>Switch</span>
 
         <BottomPanel
           style={
             this.turnedOn
-              ? { backgroundColor: "#505bda" }
-              : { backgroundColor: "#1a2849" }
+              ? { backgroundColor: '#505bda' }
+              : { backgroundColor: '#1a2849' }
           }
         >
-          <span style={turnedOnStyle}>{this.turnedOn ? "ON" : "OFF"}</span>
+          <span style={turnedOnStyle}>{this.turnedOn ? 'ON' : 'OFF'}</span>
         </BottomPanel>
       </StyledDiv>
     );
   }
 }
 
-const mapStateToProps = (state, ownProps) => ({
-  device: state.devices[ownProps.id],
-});
 const SwitchContainer = connect(mapStateToProps, RemoteService)(Switch);
 export default SwitchContainer;
diff --git a/smart-hut/src/components/dashboard/devices/SwitchStyle.js b/smart-hut/src/components/dashboard/devices/SwitchStyle.js
index e06e2f0..0f428e0 100644
--- a/smart-hut/src/components/dashboard/devices/SwitchStyle.js
+++ b/smart-hut/src/components/dashboard/devices/SwitchStyle.js
@@ -1,28 +1,31 @@
 export const imageStyle = {
-  width: "2rem",
-  height: "auto",
-  position: "absolute",
-  top: "5%",
-  left: "50%",
-  transform: "translateX(-50%)",
+  width: '2rem',
+  height: 'auto',
+  position: 'absolute',
+  top: '5%',
+  left: '50%',
+  transform: 'translateX(-50%)',
+  userSelect: 'none',
 };
 
 export const nameStyle = {
-  color: "black",
-  position: "absolute",
-  top: "30%",
-  left: "50%",
-  transform: "translateX(-50%)",
-  overflow: "hidden",
-  whiteSpace: "nowrap",
-  textOverflow: "ellipsis",
+  color: 'black',
+  position: 'absolute',
+  top: '30%',
+  left: '50%',
+  transform: 'translateX(-50%)',
+  overflow: 'hidden',
+  whiteSpace: 'nowrap',
+  textOverflow: 'ellipsis',
+  userSelect: 'none',
 };
 
 export const turnedOnStyle = {
-  color: "white",
-  fontSize: "1.3rem",
-  position: "absolute",
-  top: "20%",
-  left: "50%",
-  transform: "translateX(-50%)",
+  color: 'white',
+  fontSize: '1.3rem',
+  position: 'absolute',
+  top: '20%',
+  left: '50%',
+  transform: 'translateX(-50%)',
+  userSelect: 'none',
 };
diff --git a/smart-hut/src/components/dashboard/devices/Thermostat.css b/smart-hut/src/components/dashboard/devices/Thermostat.css
index 9c7097b..c64ffb8 100644
--- a/smart-hut/src/components/dashboard/devices/Thermostat.css
+++ b/smart-hut/src/components/dashboard/devices/Thermostat.css
@@ -1,38 +1,4 @@
-.slider-css {
-    -webkit-appearance: none;
-    width: 20rem;
-    font-family: "Lato";
-    position: absolute;
-    margin-top: 27%;
-    margin-left: 50%;
-    transform: translate(-50%, -50%);
-}
-
-.slider-css::-webkit-slider-thumb {
-    -webkit-appearance: none;
-    border: 5px solid #ffffff;
-    width: 18px;
-    height: 18px;
-    border-radius: 10px;
-    background-color: rgba(94, 246, 152, 1);
-    cursor: pointer;
-    box-shadow: 1px 1px 15px 2px rgba(0, 0, 0, 0.4);
-    margin-top: -7px;
-}
-
-.slider-css:focus {
-    -webkit-appearance: none;
-
-    outline: none;
-}
-
-.slider-css::-webkit-slider-runnable-track {
-    -webkit-appearance: none;
-    outline: none;
-    width: 100%;
-    height: 7px;
-    cursor: pointer;
-    box-shadow: 4.5px 4.5px 20px 1px rgba(0, 0, 0, 0.3);
-    background: white;
-    border-radius: 5px;
+.rangeslider.slider-css {
+  margin-left: 1rem;
+  margin-right: 1rem;
 }
diff --git a/smart-hut/src/components/dashboard/devices/ThermostatStyle.js b/smart-hut/src/components/dashboard/devices/ThermostatStyle.js
index 934f258..10346a9 100644
--- a/smart-hut/src/components/dashboard/devices/ThermostatStyle.js
+++ b/smart-hut/src/components/dashboard/devices/ThermostatStyle.js
@@ -1,73 +1,63 @@
 export const container = {
-  position: "relative",
-  width: "25rem",
-  height: "12rem",
-  boxShadow: "22px 18px 54px -7px rgba(102,102,102,1)",
-  borderRadius: "30px",
-  backgroundColor: "white",
-};
-
-export const line = {
-  width: "250px",
-  height: "47px",
-  borderBottom: "1px solid #646464",
-  position: "absolute",
-  left: "5%",
+  margin: '-1em 0',
+  width: '15em',
+  height: '15.5em',
+  boxShadow: '5px 5px 5px 5px #DDD',
+  borderRadius: '1em',
+  backgroundColor: 'white',
+  transform: 'translate(-2.5em, 0)',
 };
 
 export const deviceName = {
-  fontFamily: "Lato",
-  position: "absolute",
-  marginTop: "5%",
-  marginLeft: "8%",
-  fontSize: "1rem",
-  fontWeight: "bold",
-  color: "#646464",
+  paddingTop: '.5rem',
+  paddingLeft: '1rem',
+  fontFamily: 'Lato',
+  fontSize: '1rem',
+  fontWeight: 'bold',
 };
 
 export const targetTemperature = {
-  fontFamily: "Lato",
-  position: "absolute",
-  marginTop: "20%",
-  marginLeft: "50%",
-  transform: "translate(-50%,-50%)",
-  fontSize: "2rem",
-  fontWeight: "bold",
-  color: "#646464",
+  fontFamily: 'Lato',
+  marginTop: '.5rem',
+  width: '100%',
+  textAlign: 'center',
+  fontSize: '1.3rem',
+  fontWeight: 'bold',
+  color: '#646464',
 };
 
 export const slider = {
-  width: "25rem",
-  fontFamily: "Lato",
-  position: "absolute",
-  marginTop: "35%",
-  marginLeft: "50%",
-  transform: "translate(-50%,-50%)",
+  width: '25rem',
+  fontFamily: 'Lato',
+  position: 'absolute',
+  marginTop: '35%',
+  marginLeft: '50%',
+  transform: 'translate(-50%,-50%)',
 };
 
 export const stateTagContainer = {
-  textAlign: "center",
-  position: "absolute",
-  //width: "3rem",
-  height: "2rem",
-  marginTop: "35%",
-  marginLeft: "50%",
-  transform: "translate(-50%,-50%)",
-  padding: "0.5rem 4rem",
-  backgroundColor: "rgba(94,246,152,1)",
-  borderRadius: "50px",
+  textAlign: 'center',
+  position: 'absolute',
+  width: '10rem',
+  height: '2rem',
+  bottom: '-.25rem',
+  left: '50%',
+  transform: 'translate(-50%,-50%)',
+  backgroundColor: '#2b2',
+  borderRadius: '50px',
 };
 
 export const stateTag = {
-  fontFamily: "Lato",
-  fontSize: "1.2rem",
-  color: "white",
-  textTransform: "uppercase",
+  fontFamily: 'Lato',
+  fontSize: '1.2rem',
+  lineHeight: '2rem',
+  color: 'white',
+  textTransform: 'uppercase',
 };
 
 export const toggle = {
-  position: "absolute",
-  top: "10%",
-  left: "35%",
-  transform: "rotate(-360deg)",
+  position: 'absolute',
+  top: '.7rem',
+  right: '2.5rem',
+  transform: 'rotate(-360deg)',
 };
diff --git a/smart-hut/src/components/dashboard/devices/Thermostats.js b/smart-hut/src/components/dashboard/devices/Thermostats.js
index 4a628b7..21c32ba 100644
--- a/smart-hut/src/components/dashboard/devices/Thermostats.js
+++ b/smart-hut/src/components/dashboard/devices/Thermostats.js
@@ -1,224 +1,190 @@
-import React, { Component } from "react";
-import { Checkbox } from "semantic-ui-react";
-import { RemoteService } from "../../../remote";
-import { connect } from "react-redux";
-import "./Thermostat.css";
+import React, { Component } from 'react';
+import { Checkbox, Icon } from 'semantic-ui-react';
+import { RemoteService } from '../../../remote';
+import { connect } from 'react-redux';
+import './Thermostat.css';
+import Slider from 'react-rangeslider';
+import 'react-rangeslider/lib/index.css';
+import mapStateToProps from '../../../deviceProps';
+
 import {
   stateTag,
   container,
   deviceName,
   targetTemperature,
-  slider,
-  line,
   toggle,
   stateTagContainer,
-} from "./ThermostatStyle";
+} from './ThermostatStyle';
 
-//not quite working yet
 class Thermostats extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      targetTemperature: this.props.stateOrDevice.targetTemperature,
-      internalSensorTemperature: this.props.stateOrDevice
-        .internalSensorTemperature,
-      mode: this.props.stateOrDevice.mode,
-      measuredTemperature: this.props.stateOrDevice.measuredTemperature,
-      useExternalSensors: this.props.stateOrDevice.useExternalSensors,
-      timeout: null,
+      targetTemperature: this.props.device.targetTemperature,
+      mode: this.props.device.mode,
+      measuredTemperature: this.props.device.measuredTemperature,
     };
     this.setMode = this.setMode.bind(this);
     this.setTargetTemperature = this.setTargetTemperature.bind(this);
-    this.setInternalSensorTemperature = this.setInternalSensorTemperature.bind(
-      this
-    );
-  }
-
-  //getters
-  get getMode() {
-    return this.props.stateOrDevice.mode;
-  }
-
-  get getTargetTemperature() {
-    return this.props.stateOrDevice.targetTemperature;
-  }
-
-  get getInternalSensorTemperature() {
-    return this.props.stateOrDevice.internalSensorTemperature;
-  }
-
-  get getMeasuredTemperature() {
-    return this.props.stateOrDevice.measuredTemperature;
-  }
-
-  get getUseExternalSensors() {
-    return this.props.stateOrDevice.useExternalSensors;
   }
 
   setMode(mode) {
-    if (this.state.timeout) {
-      clearTimeout(this.state.timeout);
-    }
-    console.log(mode);
-
-    //i came to the conclusion that is not possible to set mode.
-    //this.mode = "HEATING";
+    // i came to the conclusion that is not possible to set mode.
+    // Good job Jacob (Claudio)
+    // this.mode = "HEATING";
     const turnOn = mode;
-    console.log(turnOn);
-    if (this.props.tab === "Devices") {
+    if (this.props.tab === 'Devices') {
       this.props
         .saveDevice({ ...this.props.stateOrDevice, turnOn })
-        .catch((err) => console.error("thermostat update error", err));
+        .catch((err) => console.error('thermostat update error', err));
     } else {
       this.props.updateState(
-        { id: this.props.stateOrDevice.id, turnOn: turnOn },
-        this.props.stateOrDevice.kind
+        { id: this.props.stateOrDevice.id, on: turnOn },
+        this.props.stateOrDevice.kind,
       );
     }
   }
 
   onClickDevice = () => {
     const on = !this.turnedOn;
-    if (this.props.tab === "Devices") {
+    if (this.props.tab === 'Devices') {
       this.props
         .saveDevice({ ...this.props.stateOrDevice, on })
-        .catch((err) => console.error("thermostat update error", err));
+        .catch((err) => console.error('thermostat update error', err));
     } else {
       this.props.updateState(
-        { id: this.props.stateOrDevice.id, on: on },
-        this.props.stateOrDevice.kind
+        { id: this.props.stateOrDevice.id, on },
+        this.props.stateOrDevice.kind,
       );
     }
   };
 
-  //It seems to work
   saveTargetTemperature(targetTemperature) {
-    const turn = this.props.stateOrDevice.mode !== "OFF" ? true : false;
-    if (this.props.tab === "Devices") {
+    const turn = this.props.stateOrDevice.mode !== 'OFF';
+    if (this.props.tab === 'Devices') {
       this.props
         .saveDevice({
           ...this.props.stateOrDevice,
           targetTemperature,
           turnOn: turn,
         })
-        .catch((err) => console.error("thermostat update error", err));
+        .catch((err) => console.error('thermostat update error', err));
     } else {
       this.props.updateState(
         {
           id: this.props.stateOrDevice.id,
-          targetTemperature: targetTemperature,
+          targetTemperature,
         },
-        this.props.stateOrDevice.kind
+        this.props.stateOrDevice.kind,
       );
     }
   }
 
-  setTargetTemperature(newTemp) {
-    if (this.state.timeout) {
-      clearTimeout(this.state.timeout);
-    }
-
-    this.setState({
-      newTemp,
-      timeout: setTimeout(() => {
-        this.saveTargetTemperature(newTemp);
-        this.setState({
-          targetTemperature: this.state.targetTemperature,
-          timeout: null,
-        });
-      }, 100),
-    });
+  setTargetTemperature() {
+    this.saveTargetTemperature(this.state.targetTemperature);
   }
 
-  //I have no idea why it doesn't want to update the temperature
-  saveInternalSensorTemperature(internalSensorTemperature) {
-    if (this.props.tab === "Devices") {
-      this.props
-        .saveDevice({ ...this.props.device, internalSensorTemperature })
-        .catch((err) => console.error("thermostat update error", err));
-    } else {
-      this.props.updateState(
-        {
-          id: this.props.stateOrDevice.id,
-          internalSensorTemperature: internalSensorTemperature,
-        },
-        this.props.stateOrDevice.kind
-      );
-    }
-  }
-
-  setInternalSensorTemperature(newTemp) {
-    if (this.state.timeout) {
-      clearTimeout(this.state.timeout);
-    }
-
-    this.setState({
-      newTemp,
-      timeout: setTimeout(() => {
-        this.saveInternalSensorTemperature(newTemp);
-        this.setState({
-          internalSensorTemperature: this.state.internalSensorTemperature,
-          timeout: null,
-        });
-      }, 100),
-    });
-  }
-
-  helperMode = () => {
-    //this.setMode("HEATING");
-    this.setTargetTemperature(20);
-    //this.setInternalSensorTemperature(42);
-  };
-
   handleChange = (value) => {
-    this.setTargetTemperature(value);
+    this.setState({ ...this.state, targetTemperature: value });
+  };
+
+  handleCheckbox = (val) => {
+    const useExternalSensors = val;
+    const turnOn = this.props.stateOrDevice.mode !== 'OFF';
+    if (this.props.tab === 'Devices') {
+      this.props
+        .saveDevice({ ...this.props.stateOrDevice, useExternalSensors, turnOn })
+        .catch((err) => console.error('thermostat update error', err));
+    }
   };
 
   render() {
     return (
       <div style={container}>
-        <h3 style={deviceName}>{this.props.stateOrDevice.name}</h3>
-        <div style={line}></div>
-        <Checkbox
-          checked={this.props.stateOrDevice.mode !== "OFF" ? true : false}
-          slider
-          style={toggle}
-          // TODO Manage the state hereconsole.log("CHANGE", val.checked)
-          onChange={(e, val) => this.setMode(val.checked)}
-        />
+        <h3 style={deviceName}>
+          Thermostat
+          <Checkbox
+            disabled={this.props.disabled}
+            checked={
+              this.props.tab === 'Devices'
+                ? this.props.device.mode !== 'OFF'
+                : this.props.stateOrDevice.on
+            }
+            toggle
+            style={toggle}
+            onChange={(e, val) => this.setMode(val.checked)}
+          />
+        </h3>
+        <hr />
+        <div style={targetTemperature}>
+          <Icon name="thermometer half" />
+          {' '}
+          {this.props.device.measuredTemperature}
+          {' '}
+ºC
+          <br />
+          <Icon name="target" />
+          {' '}
+          {this.props.device.targetTemperature.toFixed(1)}
+          {' '}
+ºC
+        </div>
+        {this.props.tab === 'Devices' ? (
+          <>
+            <Slider
+              disabled={this.props.disabled}
+              min={10}
+              max={30}
+              step={0.1}
+              tooltip={false}
+              className="slider-css"
+              value={this.state.targetTemperature}
+              onChange={(event) => this.handleChange(event)}
+              onChangeComplete={() => this.setTargetTemperature()}
+            />
+            <Checkbox
+              style={{ padding: '0 .7rem' }}
+              label="Use external sensors"
+              name="external"
+              toggle
+              checked={this.props.stateOrDevice.useExternalSensors}
+              disabled={!this.props.tempSensorsInRoom}
+              onChange={(e, val) => this.handleCheckbox(val.checked)}
+            />
+          </>
+        ) : null}
 
-        <span style={targetTemperature}>
-          {this.props.stateOrDevice.targetTemperature}ºC
-        </span>
-        <input
-          type="range"
-          min="0"
-          max="40"
-          className="slider-css"
-          value={this.props.stateOrDevice.targetTemperature}
-          onChange={(event) => this.handleChange(event.target.value)}
-          id="targetTemperature"
-        />
         <div style={stateTagContainer}>
-          <span style={stateTag}>{this.props.stateOrDevice.mode}</span>
+          <span style={stateTag}>
+            {this.props.tab !== 'Scenes'
+              ? this.props.device.mode
+              : this.props.stateOrDevice.on
+              ? 'WILL TURN ON'
+              : 'WILL TURN OFF'}
+          </span>
         </div>
       </div>
     );
   }
 }
 
-const mapStateToProps = (state, ownProps) => ({
-  get stateOrDevice() {
-    if (state.active.activeTab === "Devices") {
-      return state.devices[ownProps.id];
-    } else {
-      return state.sceneStates[ownProps.id];
-    }
+const mapStateToProps2 = (state, ownProps) => ({
+  ...mapStateToProps(state, ownProps),
+  get tempSensorsInRoom() {
+    if (state.active.activeTab !== 'Devices') return false;
+    const room = state.rooms[state.devices[ownProps.id].roomId];
+    if (!room) return false;
+    const deviceIds = room.devices;
+    const devices = [...deviceIds].map((id) => state.devices[id]);
+    const sensors = devices.filter(
+      (d) => d.kind === 'sensor' && d.sensor === 'TEMPERATURE',
+    );
+    return sensors.length > 0;
   },
 });
 
 const ThermostatContainer = connect(
-  mapStateToProps,
-  RemoteService
+  mapStateToProps2,
+  RemoteService,
 )(Thermostats);
 export default ThermostatContainer;
diff --git a/smart-hut/src/components/dashboard/devices/TypesOfDevices.js b/smart-hut/src/components/dashboard/devices/TypesOfDevices.js
index 6f3e2ba..1882afc 100644
--- a/smart-hut/src/components/dashboard/devices/TypesOfDevices.js
+++ b/smart-hut/src/components/dashboard/devices/TypesOfDevices.js
@@ -1,24 +1,24 @@
 export const LightDevice = {
-  img: "/img/lightOff.svg",
-  imgClick: "/img/lightOn.svg",
+  img: '/img/lightOff.svg',
+  imgClick: '/img/lightOn.svg',
 };
 
 export const SmartPlugDevice = {
-  img: "/img/smart-plug.svg",
-  imgClick: "/img/smart-plug-off.svg",
+  img: '/img/smart-plug.svg',
+  imgClick: '/img/smart-plug-off.svg',
 };
 
 export const TemperatureSensor = {
-  type: "temperature_sensor",
-  img: "",
-  imgClick: "",
-  units: "ºC",
+  type: 'temperature_sensor',
+  img: '',
+  imgClick: '',
+  units: 'ºC',
 };
 
 export const deviceList = [
-  "Light",
-  "Dimmer",
-  "Switcher",
-  "Smart Plug",
-  "Sensor",
+  'Light',
+  'Dimmer',
+  'Switcher',
+  'Smart Plug',
+  'Sensor',
 ];
diff --git a/smart-hut/src/components/dashboard/devices/Videocam.js b/smart-hut/src/components/dashboard/devices/Videocam.js
index 889233f..736fd9a 100644
--- a/smart-hut/src/components/dashboard/devices/Videocam.js
+++ b/smart-hut/src/components/dashboard/devices/Videocam.js
@@ -1,31 +1,45 @@
 // vim: set ts=2 sw=2 et tw=80:
 
-import React, { Component } from "react";
-import { StyledDivCamera } from "./styleComponents";
-import { Grid } from "semantic-ui-react";
-import { RemoteService } from "../../../remote";
-import { endpointURL } from "../../../endpoint";
-import { connect } from "react-redux";
-import VideocamModal from "./VideocamModal";
+import React, { Component } from 'react';
+import { Grid, Checkbox } from 'semantic-ui-react';
+import { connect } from 'react-redux';
+import { StyledDivCamera } from './styleComponents';
+import { RemoteService } from '../../../remote';
+import { endpointURL } from '../../../endpoint';
+import VideocamModal from './VideocamModal';
+import mapStateToProps from '../../../deviceProps';
 
 class Videocam extends Component {
   constructor(props) {
     super(props);
     this.state = { selectedVideo: undefined };
+
+    this.setOnOff = this.setOnOff.bind(this);
   }
 
   openModal = () => {
-    this.setState((state) => {
-      return { selectedVideo: true };
-    });
+    this.setState((state) => ({ selectedVideo: true }));
   };
 
   closeModal = () => {
-    this.setState((state) => {
-      return { selectedVideo: undefined };
-    });
+    this.setState((state) => ({ selectedVideo: undefined }));
   };
 
+  setOnOff(onOff) {
+    const turn = onOff;
+    if (this.props.tab === 'Devices' || this.props.tab === 'Hosts') {
+      this.props
+        .saveDevice({ ...this.props.device, on: turn })
+        .then((res) => (turn ? this.refs.vidRef.play() : this.refs.vidRef.pause()))
+        .catch((err) => console.error('videocamera update error', err));
+    } else {
+      this.props.updateState(
+        { id: this.props.stateOrDevice.id, on: turn },
+        this.props.stateOrDevice.kind,
+      );
+    }
+  }
+
   get url() {
     return endpointURL() + this.props.device.path;
   }
@@ -35,7 +49,7 @@ class Videocam extends Component {
       <div>
         <StyledDivCamera>
           <div onClick={this.openModal}>
-            <video autoPlay loop muted width="100%" height="auto">
+            <video ref="vidRef" autoPlay loop muted width="100%" height="auto">
               <source src={this.url} type="video/mp4" />
             </video>
           </div>
@@ -50,6 +64,16 @@ class Videocam extends Component {
               />
             </Grid.Column>
           </Grid.Row>
+          <Grid.Row>
+            <Grid.Column>
+              <Checkbox
+                checked={this.props.stateOrDevice.on}
+                toggle
+                label="Turn on/off"
+                onChange={(e, val) => this.setOnOff(val.checked)}
+              />
+            </Grid.Column>
+          </Grid.Row>
         </Grid>
       </div>
     );
@@ -58,8 +82,5 @@ class Videocam extends Component {
   }
 }
 
-const mapStateToProps = (state, ownProps) => ({
-  device: state.devices[ownProps.id],
-});
 const VideocamContainer = connect(mapStateToProps, RemoteService)(Videocam);
 export default VideocamContainer;
diff --git a/smart-hut/src/components/dashboard/devices/VideocamModal.js b/smart-hut/src/components/dashboard/devices/VideocamModal.js
index 7a1e553..6e9cb3b 100644
--- a/smart-hut/src/components/dashboard/devices/VideocamModal.js
+++ b/smart-hut/src/components/dashboard/devices/VideocamModal.js
@@ -1,34 +1,42 @@
-import React from "react";
-import Modal from "react-modal";
-import { Button } from "semantic-ui-react";
-
-const ModalStyle = {
-  content: {
-    top: "20%",
-    left: "45%",
-    right: "auto",
-    bottom: "auto",
-    marginRight: "-40%",
-    width: "80%",
-    transform: "translate(-40%, -10%)",
-  },
-};
+import React from 'react';
+import Modal from 'react-modal';
 
 const VideocamModal = (props) => (
   <Modal
     isOpen={!!props.selectedVideo}
     contentLabel="Live Cam"
     onRequestClose={props.closeModal}
-    style={ModalStyle}
+    style={{
+      overlay: {
+        position: 'fixed',
+        top: 0,
+        left: 0,
+        right: 0,
+        bottom: 0,
+        backgroundColor: 'rgba(0,0,0,0.5)',
+      },
+      content: {
+        position: 'absolute',
+        top: '40px',
+        left: '40px',
+        right: '40px',
+        bottom: '40px',
+        border: '1px solid #ccc',
+        background: '#fff',
+        overflow: 'auto',
+        WebkitOverflowScrolling: 'touch',
+        borderRadius: '4px',
+        outline: 'none',
+        padding: '20px',
+        backgroundColor: 'black',
+      },
+    }}
   >
     {props.selectedVideo && (
-      <video autoPlay loop muted width="100%" height="auto">
+      <video autoPlay loop muted width="100%" height="90%">
         <source src={props.url} type="video/mp4" />
       </video>
     )}
-    <Button fluid primary onClick={props.closeModal}>
-      Close
-    </Button>
   </Modal>
 );
 
diff --git a/smart-hut/src/components/dashboard/devices/styleComponents.js b/smart-hut/src/components/dashboard/devices/styleComponents.js
index 7815ce7..f388f83 100644
--- a/smart-hut/src/components/dashboard/devices/styleComponents.js
+++ b/smart-hut/src/components/dashboard/devices/styleComponents.js
@@ -1,104 +1,105 @@
-import styled from "styled-components";
-import { useCircularInputContext } from "react-circular-input";
-import { ValueStyle } from "./DimmerStyle";
-import React from "react";
+import styled from 'styled-components';
+import { useCircularInputContext } from 'react-circular-input';
+import React from 'react';
+import { ValueStyle } from './DimmerStyle';
 
 export const editButtonStyle = {
-  position: "absolute",
-  top: "0",
-  right: "0",
-  backgroundColor: "#505bda",
-  borderRadius: "0 0 0 20px",
-  border: "none",
-  padding: ".4rem 1.2rem",
-  outline: "none",
-  color: "white",
-  fontFamily: "Lato",
-  textTransform: "uppercase",
+  position: 'absolute',
+  top: '0',
+  right: '0',
+  backgroundColor: '#505bda',
+  borderRadius: '0 0 0 20px',
+  border: 'none',
+  padding: '.4rem 1.2rem',
+  outline: 'none',
+  color: 'white',
+  fontFamily: 'Lato',
+  textTransform: 'uppercase',
 };
 
 export const panelStyle = {
-  backgroundColor: "#fafafa",
-  height: "85vh",
-  padding: "0rem 3rem",
-  color: "#000000",
-  overflow: "auto",
-  maxHeight: "75vh",
+  backgroundColor: '#fafafa',
+  height: '85vh',
+  padding: '0rem 3rem',
+  color: '#000000',
+  overflow: 'auto',
+  maxHeight: '75vh',
 };
 
 export const mobilePanelStyle = {
-  backgroundColor: "#fafafa",
-  minHeight: "100vh",
-  padding: "0rem 3rem",
-  color: "#000000",
+  backgroundColor: '#fafafa',
+  minHeight: '100vh',
+  padding: '0rem 3rem',
+  color: '#000000',
 };
 
 export const editModeStyle = {
-  position: "absolute",
-  top: "15%",
-  right: "0",
-  width: "1.5rem",
-  height: "1.5rem",
-  backgroundColor: "black",
-  borderRadius: "100%",
-  zIndex: "1000",
-  cursor: "pointer",
+  position: 'absolute',
+  top: '15%',
+  right: '0',
+  width: '1.5rem',
+  height: '1.5rem',
+  backgroundColor: 'black',
+  borderRadius: '100%',
+  zIndex: '1000',
+  cursor: 'pointer',
 };
 
 export const editModeStyleLeft = {
-  position: "absolute",
-  top: "15%",
-  left: "0",
-  width: "1.5rem",
-  height: "1.5rem",
-  backgroundColor: "white",
-  borderRadius: "100%",
-  zIndex: "1000",
-  cursor: "pointer",
+  position: 'absolute',
+  top: '15%',
+  left: '0',
+  width: '1.5rem',
+  height: '1.5rem',
+  backgroundColor: 'white',
+  borderRadius: '100%',
+  zIndex: '1000',
+  cursor: 'pointer',
 };
 
 export const editModeIconStyle = {
-  position: "absolute",
-  top: "50%",
-  left: "50%",
-  transform: "translate(-50%, -50%)",
-  width: "0.75rem",
-  height: "0.75rem",
-  borderRadius: "20%",
-  zIndex: "101",
+  position: 'absolute',
+  top: '50%',
+  left: '50%',
+  transform: 'translate(-50%, -50%)',
+  width: '0.75rem',
+  height: '0.75rem',
+  borderRadius: '20%',
+  zIndex: '101',
 };
 
 export const iconStyle = {
-  width: "3.5rem",
-  height: "auto",
-  position: "absolute",
-  top: "10%",
-  left: "50%",
-  transform: "translateX(-50%)",
+  width: '3.5rem',
+  height: 'auto',
+  position: 'absolute',
+  top: '10%',
+  left: '50%',
+  transform: 'translateX(-50%)',
+  userSelect: 'none',
 };
 export const nameStyle = {
-  position: "absolute",
-  top: "50%",
-  left: "50%",
-  transform: "translateX(-50%)",
+  position: 'absolute',
+  top: '50%',
+  left: '50%',
+  transform: 'translateX(-50%)',
 };
 
 export const formStyle = {
-  position: "absolute",
-  zIndex: "1000",
-  width: "80rem",
-  height: "10rem",
-  padding: "1rem",
-  margin: "1rem",
-  borderRadius: "10%",
-  boxShadow: "1px 1px 5px 2px #5d5d5d",
-  backgroundColor: "#3e99ff",
+  position: 'absolute',
+  zIndex: '1000',
+  width: '80rem',
+  height: '10rem',
+  padding: '1rem',
+  margin: '1rem',
+  borderRadius: '10%',
+  boxShadow: '1px 1px 5px 2px #5d5d5d',
+  backgroundColor: '#3e99ff',
 };
 
 export const addDeviceFormStyle = {
-  maxWidth: "400px",
-  background: "#3e99ff",
-  paddingRight: "5rem",
+  maxWidth: '400px',
+  background: '#3e99ff',
+  paddingRight: '5rem',
 };
 
 export const StyledDiv = styled.div`
diff --git a/smart-hut/src/deviceProps.js b/smart-hut/src/deviceProps.js
new file mode 100644
index 0000000..f79de98
--- /dev/null
+++ b/smart-hut/src/deviceProps.js
@@ -0,0 +1,69 @@
+function getStateOrDevice(state, ownProps) {
+  switch (state.active.activeTab) {
+    case 'Devices':
+      return state.devices[ownProps.id];
+    case 'Scenes':
+      return state.sceneStates[ownProps.id];
+    case 'Hosts':
+      return state.hostDevices[ownProps.hostId][ownProps.id];
+    default:
+      throw new Error(
+        `stateOrDevice has no value in tab "${state.active.activeTab}"`,
+      );
+  }
+}
+
+function getDevice(state, ownProps) {
+  switch (state.active.activeTab) {
+    case 'Scenes':
+      return state.devices[getStateOrDevice(state, ownProps).deviceId];
+    case 'Devices':
+    case 'Hosts':
+      return getStateOrDevice(state, ownProps);
+    default:
+      throw new Error(`device has no value in tab "${state.active.activeTab}"`);
+  }
+}
+
+function getRoomName(state, ownProps) {
+  switch (state.active.activeTab) {
+    case 'Scenes':
+    case 'Devices':
+      return (state.rooms[getDevice(state, ownProps).roomId] || {}).name;
+    case 'Hosts':
+      const hostRooms = state.hostRooms[ownProps.hostId];
+      if (!hostRooms) return '';
+      const room = hostRooms[getDevice(state, ownProps).roomId];
+      if (!room) return '';
+      return room.name;
+    default:
+      throw new Error(
+        `room name has no value in tab "${state.active.activeTab}"`,
+      );
+  }
+}
+
+export default function mapStateToProps(state, ownProps) {
+  return {
+    activeHost: state.active.activeHost,
+    get stateOrDevice() {
+      return getStateOrDevice(state, ownProps);
+    },
+    get device() {
+      return getDevice(state, ownProps);
+    },
+    get roomName() {
+      return getRoomName(state, ownProps);
+    },
+    get type() {
+      return getDevice(state, ownProps).kind;
+    },
+    get disabled() {
+      return (
+        ownProps.tab === 'Hosts'
+        && ['dimmableLight', 'light'].indexOf(getDevice(state, ownProps).kind)
+          === -1
+      );
+    },
+  };
+}
diff --git a/smart-hut/src/endpoint.js b/smart-hut/src/endpoint.js
index 6dbc3b0..32a15e7 100644
--- a/smart-hut/src/endpoint.js
+++ b/smart-hut/src/endpoint.js
@@ -3,17 +3,17 @@
  * @returns {String} endpoint URL
  */
 export function endpointURL() {
-  return window.BACKEND_URL !== "__BACKEND_URL__"
+  return window.BACKEND_URL !== '__BACKEND_URL__'
     ? window.BACKEND_URL
-    : "http://localhost:8080";
+    : 'http://localhost:8080';
 }
 
 export function socketURL(token) {
   const httpURL = new URL(endpointURL());
-  const isSecure = httpURL.protocol === "https:";
-  const protocol = isSecure ? "wss:" : "ws:";
+  const isSecure = httpURL.protocol === 'https:';
+  const protocol = isSecure ? 'wss:' : 'ws:';
   const port = httpURL.port || (isSecure ? 443 : 80);
   const url = `${protocol}//${httpURL.hostname}:${port}/sensor-socket?token=${token}`;
-  console.log("socket url: ", url);
+  console.log('socket url: ', url);
   return url;
 }
diff --git a/smart-hut/src/index.js b/smart-hut/src/index.js
index 111847a..2aa57e9 100644
--- a/smart-hut/src/index.js
+++ b/smart-hut/src/index.js
@@ -1,9 +1,9 @@
-import React from "react";
-import ReactDOM from "react-dom";
-import App from "./App";
-import * as serviceWorker from "./serviceWorker";
-import { Provider } from "react-redux";
-import smartHutStore from "./store";
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { Provider } from 'react-redux';
+import App from './App';
+import * as serviceWorker from './serviceWorker';
+import smartHutStore from './store';
 
 const index = (
   <Provider store={smartHutStore}>
@@ -11,5 +11,5 @@ const index = (
   </Provider>
 );
 
-ReactDOM.render(index, document.getElementById("root"));
+ReactDOM.render(index, document.getElementById('root'));
 serviceWorker.unregister();
diff --git a/smart-hut/src/remote.js b/smart-hut/src/remote.js
index c238c56..4a56a09 100644
--- a/smart-hut/src/remote.js
+++ b/smart-hut/src/remote.js
@@ -1,8 +1,8 @@
-import smartHutStore from "./store";
-import actions from "./storeActions";
-import axios from "axios";
-import { endpointURL, socketURL } from "./endpoint";
-import { connect, disconnect } from "@giantmachines/redux-websocket";
+import axios from 'axios';
+import { connect, disconnect } from '@giantmachines/redux-websocket';
+import smartHutStore from './store';
+import actions from './storeActions';
+import { endpointURL, socketURL } from './endpoint';
 
 /**
  * An object returned by promise rejections in remoteservice
@@ -13,7 +13,11 @@ class RemoteError extends Error {
   messages;
 
   constructor(messages) {
-    super(messages.join(" - "));
+    super(
+      messages && Array.isArray(messages)
+        ? messages.join(' - ')
+        : JSON.stringify(messages, null, 2),
+    );
     this.messages = messages;
   }
 }
@@ -41,23 +45,22 @@ const Endpoint = {
    */
   send: (method, route, query = {}, body = null) => {
     if (!Endpoint.token) {
-      throw new Error("No token while performing authenticated request");
+      throw new Error('No token while performing authenticated request');
     }
 
     return Endpoint.axiosInstance(route, {
-      method: method,
+      method,
       params: query,
-      data: ["put", "post"].indexOf(method) !== -1 ? body : null,
+      data: ['put', 'post'].indexOf(method) !== -1 ? body : null,
       headers: {
         Authorization: `Bearer ${Endpoint.token}`,
       },
     }).then((res) => {
-      if (!res.data && method !== "delete") {
-        console.error("Response body is empty");
+      if (!res.data && method !== 'delete') {
+        console.error('Response body is empty');
         return null;
-      } else {
-        return res;
       }
+        return res;
     });
   },
 
@@ -68,20 +71,17 @@ const Endpoint = {
    * @param {[String]String} query query ('?') parameters (no params by default)
    * @param {any} body the JSON request body
    */
-  sendNA: (method, route, query = {}, body = null) => {
-    return Endpoint.axiosInstance(route, {
-      method: method,
+  sendNA: (method, route, query = {}, body = null) => Endpoint.axiosInstance(route, {
+      method,
       params: query,
-      data: ["put", "post"].indexOf(method) !== -1 ? body : null,
+      data: ['put', 'post'].indexOf(method) !== -1 ? body : null,
     }).then((res) => {
       if (!res.data) {
-        console.error("Response body is empty");
+        console.error('Response body is empty');
         return null;
-      } else {
-        return res;
       }
-    });
-  },
+        return res;
+    }),
 
   /**
    * Performs login
@@ -90,26 +90,24 @@ const Endpoint = {
    * @returns {Promise<String, *>} promise that resolves to the token string
    *  and rejects to the axios error.
    */
-  login: (usernameOrEmail, password) => {
-    return Endpoint.axiosInstance
-      .post(`/auth/login`, {
+  login: (usernameOrEmail, password) => Endpoint.axiosInstance
+      .post('/auth/login', {
         usernameOrEmail,
         password,
       })
       .then((res) => {
-        localStorage.setItem("token", res.data.jwttoken);
-        localStorage.setItem("exp", new Date().getTime() + 5 * 60 * 60 * 1000);
+        localStorage.setItem('token', res.data.jwttoken);
+        localStorage.setItem('exp', new Date().getTime() + 5 * 60 * 60 * 1000);
         return res.data.jwttoken;
-      });
-  },
+      }),
 
   /**
    * Returns an immediately resolved promise for the socket logouts
    * @return {Promise<Undefined, _>} An always-resolved promise
    */
   logout: () => {
-    localStorage.removeItem("token");
-    localStorage.removeItem("exp");
+    localStorage.removeItem('token');
+    localStorage.removeItem('exp');
     return Promise.resolve(void 0);
   },
 
@@ -120,7 +118,7 @@ const Endpoint = {
    * @returns {Promise<*, *>} The Axios-generated promise
    */
   get(route, query = {}) {
-    return this.send("get", route, query);
+    return this.send('get', route, query);
   },
 
   /**
@@ -131,7 +129,7 @@ const Endpoint = {
    * @returns {Promise<*, *>} The Axios-generated promise
    */
   post(route, query, body) {
-    return this.send("post", route, query, body);
+    return this.send('post', route, query, body);
   },
 
   /**
@@ -142,7 +140,7 @@ const Endpoint = {
    * @returns {Promise<*, *>} The Axios-generated promise
    */
   postNA(route, query, body) {
-    return this.sendNA("post", route, query, body);
+    return this.sendNA('post', route, query, body);
   },
 
   /**
@@ -153,7 +151,7 @@ const Endpoint = {
    * @returns {Promise<*, *>} The Axios-generated promise
    */
   put(route, query = {}, body = {}) {
-    return this.send("put", route, query, body);
+    return this.send('put', route, query, body);
   },
 
   /**
@@ -164,7 +162,7 @@ const Endpoint = {
    * @returns {Promise<*, *>} The Axios-generated promise
    */
   putNA(route, query = {}, body = {}) {
-    return this.sendNA("put", route, query, body);
+    return this.sendNA('put', route, query, body);
   },
 
   /**
@@ -175,7 +173,7 @@ const Endpoint = {
    * @returns {Promise<*, *>} The Axios-generated promise
    */
   delete(route, query = {}) {
-    return this.send("delete", route, query);
+    return this.send('delete', route, query);
   },
 };
 
@@ -187,17 +185,17 @@ const Endpoint = {
  */
 function parseValidationErrors(err) {
   if (
-    err.response &&
-    err.response.status === 400 &&
-    err.response.data &&
-    Array.isArray(err.response.data.errors)
+    err.response
+    && err.response.status === 400
+    && err.response.data
+    && Array.isArray(err.response.data.errors)
   ) {
     throw new RemoteError([
       ...new Set(err.response.data.errors.map((e) => e.defaultMessage)),
     ]);
   } else {
-    console.warn("Non validation error", err);
-    throw new RemoteError(["Network error"]);
+    console.warn('Non validation error', err);
+    throw new RemoteError(['Network error']);
   }
 }
 
@@ -209,67 +207,70 @@ export const RemoteService = {
    * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
    *  with user-fiendly errors as a RemoteError
    */
-  login: (usernameOrEmail, password) => {
-    return (dispatch) => {
-      return Endpoint.login(usernameOrEmail, password)
+  login: (usernameOrEmail, password) => (dispatch) => Endpoint.login(usernameOrEmail, password)
         .then((token) => {
           dispatch(actions.loginSuccess(token));
           dispatch(connect(socketURL(token)));
         })
         .catch((err) => {
-          console.warn("login error", err);
+          console.warn('login error', err);
           throw new RemoteError([
             err.response && err.response.status === 401
-              ? "Wrong credentials"
-              : "An error occurred while logging in",
+              ? 'Wrong credentials'
+              : 'An error occurred while logging in',
           ]);
-        });
-    };
-  },
+        }),
 
   /**
    * Performs logout
    */
-  logout: () => {
-    return (dispatch) =>
-      Endpoint.logout().then(() => {
+  logout: () => (dispatch) => Endpoint.logout().then(() => {
         dispatch(disconnect());
         dispatch(actions.logout());
-      });
-  },
+      }),
 
   /**
    * Fetches user information via REST calls, if it is logged in
    * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
    *  with user-fiendly errors as a RemoteError
    */
-  fetchUserInfo: () => {
-    return (dispatch) => {
-      return Endpoint.get("/auth/profile")
+  userPermissions: (data) => (dispatch) => Endpoint.put('/user/permissions', {}, data).catch((err) => {
+        console.warn('Fetch user info error', err);
+        throw new RemoteError(['Network error']);
+      }),
+
+  /**
+   * Fetches user information via REST calls, if it is logged in
+   * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
+   *  with user-fiendly errors as a RemoteError
+   */
+  fetchUserInfo: () => (dispatch) => Endpoint.get('/auth/profile')
         .then((res) => void dispatch(actions.userInfoUpdate(res.data)))
         .catch((err) => {
-          console.warn("Fetch user info error", err);
-          throw new RemoteError(["Network error"]);
-        });
-    };
-  },
+          console.warn('Fetch user info error', err);
+          throw new RemoteError(['Network error']);
+        }),
 
   /**
    * Fetches all rooms that belong to this user. This call does not
    * populate the devices attribute in rooms.
+   * @param {Number|null} hostId the user id of the host we need to fetch the rooms from.
+   *  Null if we need to fetch our own rooms.
    * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
    *  with user-fiendly errors as a RemoteError
    */
-  fetchAllRooms: () => {
-    return (dispatch) => {
-      return Endpoint.get("/room")
-        .then((res) => void dispatch(actions.roomsUpdate(res.data)))
+  fetchAllRooms: (hostId = null) => (dispatch) => Endpoint.get('/room', hostId ? { hostId } : null)
+        .then(
+          (res) => void dispatch(
+              hostId
+                ? actions.hostRoomsUpdate(hostId, res.data)
+                : actions.roomsUpdate(res.data),
+            ),
+        )
         .catch((err) => {
-          console.error("Fetch all rooms error", err);
-          throw new RemoteError(["Network error"]);
-        });
-    };
-  },
+          console.error('Fetch all rooms error', err);
+          throw new RemoteError(['Network error']);
+        }),
 
   /**
    * Fetches all scenes that belong to this user. This call does not
@@ -277,80 +278,56 @@ export const RemoteService = {
    * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
    *  with user-fiendly errors as a RemoteError
    */
-  fetchAllScenes: () => {
-    return (dispatch) => {
-      return Endpoint.get("/scene")
-        .then((res) => void dispatch(actions.scenesUpdate(res.data)))
+  fetchAllScenes: (hostId = null) => (dispatch) => Endpoint.get('/scene', hostId ? { hostId } : {})
+        .then(
+          (res) => void dispatch(
+              !hostId
+                ? actions.scenesUpdate(res.data)
+                : actions.hostScenesUpdate(hostId, res.data),
+            ),
+        )
         .catch((err) => {
-          console.error("Fetch all scenes error", err);
-          throw new RemoteError(["Network error"]);
-        });
-    };
-  },
+          console.error('Fetch all scenes error', err);
+          throw new RemoteError(['Network error']);
+        }),
 
   /**
    * Fetches all devices in a particular room, or fetches all devices.
    * This also updates the devices attribute on values in the map rooms.
    * @param {Number|null} roomId the rsoom to which fetch devices
    *   from, null to fetch from all rooms
+   * @param {Number|null} hostId the user id of the owner of the devices to get
+   *   (can be used for host view)
    * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
    *  with user-fiendly errors as a RemoteError
    */
-  fetchDevices: (roomId = null) => {
-    return (dispatch) => {
-      return Endpoint.get(roomId ? `/room/${roomId}/device` : "/device")
-        .then((res) => void dispatch(actions.devicesUpdate(roomId, res.data)))
+  fetchDevices: (roomId = null, hostId = null) => (dispatch) => Endpoint.get(
+        roomId ? `/room/${roomId}/device` : '/device',
+        hostId ? { hostId } : null,
+      )
+        .then(
+          (res) => void dispatch(
+              !hostId
+                ? actions.devicesUpdate(roomId, res.data, hostId)
+                : actions.hostDevicesUpdate(hostId, res.data),
+            ),
+        )
         .catch((err) => {
           console.error(`Fetch devices roomId=${roomId} error`, err);
-          throw new RemoteError(["Network error"]);
-        });
-    };
-  },
+          throw new RemoteError(['Network error']);
+        }),
 
   /**
    * Fetches all the automations
    * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
    *  with user-fiendly errors as a RemoteError
    */
-  fetchAutomations: () => {
-    return (dispatch) => {
-      return Endpoint.get("/automation/")
-        .then((res) => {
-          const length = res.data.length;
-          const automations = [];
-
-          res.data.forEach((a, index) => {
-            const { id, name } = a;
-            const automation = {
-              name,
-              id,
-              triggers: [],
-              scenes: [],
-            };
-
-            return Endpoint.get(`/booleanTrigger/${id}`).then((res) => {
-              automation.triggers.push(...res.data);
-              return Endpoint.get(`/rangeTrigger/${id}`).then((res) => {
-                automation.triggers.push(...res.data);
-                return Endpoint.get(`/scenePriority/${id}`).then((res) => {
-                  automation.scenes.push(...res.data);
-                  automations.push(automation);
-                  if (index + 1 === length) {
-                    return void dispatch(
-                      actions.automationsUpdate(automations)
-                    );
-                  }
-                });
-              });
-            });
-          });
-        })
+  fetchAutomations: () => (dispatch) => Endpoint.get('/automation/')
+        .then((res) => void dispatch(actions.automationsUpdate(res.data)))
         .catch((err) => {
-          console.error(`Fetch automations error`, err);
-          throw new RemoteError(["Network error"]);
-        });
-    };
-  },
+          console.error('Fetch automations error', err);
+          throw new RemoteError(['Network error']);
+        }),
 
   /**
    * Fetches all devices in a particular scene, or fetches all devices.
@@ -360,16 +337,50 @@ export const RemoteService = {
    * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
    *  with user-fiendly errors as a RemoteError
    */
-  fetchStates: (sceneId) => {
-    return (dispatch) => {
-      return Endpoint.get(`/scene/${sceneId}/states`)
+  fetchStates: (sceneId) => (dispatch) => Endpoint.get(`/scene/${sceneId}/states`)
         .then((res) => void dispatch(actions.statesUpdate(sceneId, res.data)))
         .catch((err) => {
           console.error(`Fetch devices sceneId=${sceneId} error`, err);
-          throw new RemoteError(["Network error"]);
-        });
-    };
-  },
+          throw new RemoteError(['Network error']);
+        }),
+
+  /**
+   * Fetches all hosts of a particular user.
+   * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
+   *  with user-fiendly errors as a RemoteError
+   */
+  fetchHosts: () => (dispatch) => Endpoint.get('/user/hosts')
+        .then((res) => void dispatch(actions.hostsUpdate(res.data)))
+        .catch((err) => {
+          console.error('Fetch hosts error', err);
+          throw new RemoteError(['Network error']);
+        }),
+
+  /**
+   * Fetches all guests of a particular user.
+   * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
+   *  with user-fiendly errors as a RemoteError
+   */
+  fetchGuests: () => (dispatch) => Endpoint.get('/user/guests')
+        .then((res) => void dispatch(actions.guestsUpdate(res.data)))
+        .catch((err) => {
+          console.error('Fetch guests error', err);
+          throw new RemoteError(['Network error']);
+        }),
+
+  /**
+   * Adds the current user as a guest to another user
+   * identified through a user id.
+   * @param {Number[]} userId the users to add.
+   * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
+   *  with user-fiendly errors as a RemoteError
+   */
+  updateGuests: (userIds) => (dispatch) => Endpoint.put('/user/guests', {}, { ids: userIds })
+        .then((res) => void dispatch(actions.guestsUpdate(res.data)))
+        .catch((err) => {
+          console.error('Guest save error', err);
+          throw new RemoteError(['Network Error']);
+        }),
 
   /**
    * Creates/Updates a room with the given data
@@ -380,8 +391,7 @@ export const RemoteService = {
    * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
    *  with user-fiendly errors as a RemoteError
    */
-  saveRoom: (data, roomId = null) => {
-    return (dispatch) => {
+  saveRoom: (data, roomId = null) => (dispatch) => {
       data = {
         name: data.name,
         icon: data.icon,
@@ -390,43 +400,63 @@ export const RemoteService = {
 
       return (roomId
         ? Endpoint.put(`/room/${roomId}`, {}, data)
-        : Endpoint.post(`/room`, {}, data)
+        : Endpoint.post('/room', {}, data)
       )
         .then((res) => void dispatch(actions.roomSave(res.data)))
         .catch(parseValidationErrors);
-    };
-  },
+    },
 
   /**
    * Creates/Updates a scene with the given data
    * @param {String} data.name the scene's name,
    * @param {Number|null} sceneId the scene's id if update, null for creation
+   * @param {Number|null} copyFrom the id of the scene from which the states must be copied from.
+   *  (ignored for updates)
    * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
    *  with user-fiendly errors as a RemoteError
    */
-  saveScene: (data, sceneId = null) => {
-    return (dispatch) => {
+  saveScene: (data, sceneId = null, copyFrom = null) => (dispatch) => {
+      copyFrom = sceneId === null ? copyFrom : null;
       data = {
         name: data.name,
+        icon: data.icon,
+        guestAccessEnabled: sceneId ? data.guestAccessEnabled : false,
       };
 
       return (sceneId
         ? Endpoint.put(`/scene/${sceneId}`, {}, data)
-        : Endpoint.post(`/scene`, {}, data)
+        : Endpoint.post('/scene', {}, data)
       )
-        .then((res) => void dispatch(actions.sceneSave(res.data)))
-        .catch(parseValidationErrors);
-    };
-  },
+        .then(async (res) => {
+          let states = [];
 
-  //
-  updateState: (data, type) => {
-    return (dispatch) => {
+          if (copyFrom) {
+            const sceneId = res.data.id;
+            try {
+              const res = await Endpoint.post(
+                `/scene/${sceneId}/copyFrom/${copyFrom}`,
+              );
+              states = res.data;
+            } catch (e) {
+              console.warn(`Error in state cloning from scene ${copyFrom}`, e);
+              throw new RemoteError(['Network error']);
+            }
+          }
+
+          dispatch(actions.sceneSave(res.data));
+          if (states.length > 0) {
+            dispatch(actions.statesUpdate(sceneId, states));
+          }
+        })
+        .catch(parseValidationErrors);
+    },
+
+  updateState: (data, type) => (dispatch) => {
       let url;
-      if (data.on) {
-        url = "/switchableState";
+      if (data.on !== undefined) {
+        url = '/switchableState';
       } else {
-        url = "/dimmableState";
+        url = '/dimmableState';
       }
 
       return Endpoint.put(url, {}, data)
@@ -435,41 +465,43 @@ export const RemoteService = {
           return res.data;
         })
         .catch((err) => {
-          console.warn("Update device: ", data, "error: ", err);
-          throw new RemoteError(["Network error"]);
+          console.warn('Update device: ', data, 'error: ', err);
+          throw new RemoteError(['Network error']);
         });
-    };
-  },
+    },
 
-  deleteState: (id, type) => {
-    return (dispatch) => {
+  deleteState: (id, type) => (dispatch) => {
       let url;
-      if (type === "dimmableState") {
-        url = "/dimmableState";
+      if (type === 'dimmableState') {
+        url = '/dimmableState';
       } else {
-        url = "/switchableState";
+        url = '/switchableState';
       }
-      return Endpoint.delete(url + `/${id}`)
+      return Endpoint.delete(`${url}/${id}`)
         .then((_) => dispatch(actions.stateDelete(id)))
         .catch((err) => {
-          console.warn("state delete error", err);
-          throw new RemoteError(["Network error"]);
+          console.warn('state delete error', err);
+          throw new RemoteError(['Network error']);
         });
-    };
-  },
+    },
 
-  sceneApply: (id) => {
-    return (dispatch) => {
+  sceneApply: (id, hostId = null) => (dispatch) => {
       let url = `/scene/${id}/apply`;
+      if (hostId) {
+        url = `${url}?hostId=${hostId}`;
+      }
 
       return Endpoint.post(url)
-        .then((res) => dispatch(actions.deviceOperationUpdate(res.data)))
+        .then((res) => dispatch(
+            hostId
+              ? actions.hostDevicesUpdate(hostId, res.data, true)
+              : actions.deviceOperationUpdate(res.data),
+          ))
         .catch((err) => {
-          console.warn("scene apply error", err);
-          throw new RemoteError(["Network error"]);
+          console.warn('scene apply error', err);
+          throw new RemoteError(['Network error']);
         });
-    };
-  },
+    },
 
   /**
    * Creates/Updates a device with the given data. If
@@ -483,97 +515,181 @@ export const RemoteService = {
    * @returns {Promise<Device, RemoteError>} promise that resolves to the saved device and rejects
    *  with user-fiendly errors as a RemoteError
    */
-  saveDevice: (data) => {
-    return (dispatch) => {
-      let url = "/device";
-      if ((data.id && data.flowType === "OUTPUT") || !data.id) {
-        url = "/" + data.kind;
+  saveDevice: (data, hostId = null) => (dispatch) => {
+      let url = '/device';
+      if ((data.id && data.flowType === 'OUTPUT') || !data.id) {
+        url = `/${data.kind}`;
       }
 
-      return Endpoint[data.id ? "put" : "post"](url, {}, data)
+      return Endpoint[data.id ? 'put' : 'post'](
+        url,
+        hostId ? { hostId } : {},
+        data,
+      )
         .then((res) => {
-          dispatch(actions.deviceSave(res.data));
+          dispatch(
+            hostId
+              ? actions.hostDeviceSave(hostId, res.data)
+              : actions.deviceSave(res.data),
+          );
           return res.data;
         })
         .catch((err) => {
-          console.warn("Update device: ", data, "error: ", err);
-          throw new RemoteError(["Network error"]);
+          console.warn('Update device: ', data, 'error: ', err);
+          throw new RemoteError(['Network error']);
         });
-    };
-  },
+    },
+
+    updateSimulation: (data) => (dispatch) => {
+      const url = `/sensor/${data.id}/simulation`;
+      const param = {
+        typical: data.typical,
+        error: data.err,
+      };
+      return Endpoint.put(url, {}, param)
+      .then((res) => {
+        dispatch(actions.deviceSave(res.data));
+        return res.data;
+      })
+      .catch((err) => {
+        console.warn('Update device: ', data, 'error: ', err);
+        throw new RemoteError(['Network error']);
+      });
+    },
+
+  fastUpdateAutomation: (automation) => (dispatch) => Endpoint.put('/automation/fast', {}, automation)
+        .then((res) => dispatch(actions.automationSave(res.data)))
+        .catch((err) => {
+          console.warn('Update automation: ', automation, 'error: ', err);
+          throw new RemoteError(['Network error']);
+        }),
 
   /**
    * Creates/Updates an automation with the given data. If
    * data.id is truthy, then a update call is performed,
    * otherwise a create call is performed.
-   * @param {Automation} data the device to update.
+   * @param {Automation} data the automation to update.
    * @returns {Promise<Device, RemoteError>} promise that resolves to the saved device and rejects
    *  with user-fiendly errors as a RemoteError
    */
   saveAutomation: (data) => {
-    const { automation, triggerList, order } = data;
-    console.log("automation: ", automation, triggerList, order);
+    const {
+ automation, triggerList, order, conditionList,
+} = data;
     automation.triggers = [];
     automation.scenes = [];
+    automation.condition = [];
     return (dispatch) => {
-      let urlAutomation = "/automation";
-      let urlBooleanTrigger = "/booleanTrigger";
-      let urlRangeTrigger = "/rangeTrigger";
-      let urlScenePriority = "/scenePriority";
+      const urlAutomation = '/automation';
+      const urlBooleanTrigger = '/booleanTrigger';
+      const urlRangeTrigger = '/rangeTrigger';
+      const urlScenePriority = '/scenePriority';
+      // conditions
+      const urlRangeCondition = '/rangeCondition';
+      const urlBooleanCondition = '/booleanCondition';
+      const urlThermostatCondition = '/thermostatCondition';
 
-      let rangeTriggerList = triggerList.filter((trigger) =>
-        trigger.hasOwnProperty("operand")
-      );
-      let booleanTriggerList = triggerList.filter(
-        (trigger) => !trigger.hasOwnProperty("operand")
+      const rangeTriggerList = triggerList.filter((trigger) => 'operand' in trigger);
+      const booleanTriggerList = triggerList.filter(
+        (trigger) => !('operand' in trigger),
       );
+      const rangeConditionList = conditionList.filter((condition) => 'operand' in condition && 'value' in condition);
+      const booleanConditionList = conditionList.filter((condition) => 'on' in condition);
+      const thermostatConditionList = conditionList.filter((condition) => 'operand' in condition && 'mode' in condition);
 
-      return Endpoint["post"](urlAutomation, {}, automation).then(
+
+      return Endpoint.post(urlAutomation, {}, automation).then(
         async (automationRes) => {
           const { id } = automationRes.data;
           // Introduce the range triggers in the automation
-          for (let t of rangeTriggerList) {
+          const resRangeTriggers = [];
+          for (const t of rangeTriggerList) {
             const trigger = {
               automationId: id,
               deviceId: t.device,
               operator: t.operand,
               range: t.value,
             };
-            let resRange = await Endpoint.post(urlRangeTrigger, {}, trigger);
-            automation.triggers.push(resRange.data);
+            resRangeTriggers.push(Endpoint.post(urlRangeTrigger, {}, trigger));
           }
+          automation.triggers = (await Promise.all(resRangeTriggers)).map((v) => v.data);
 
-          for (let t of booleanTriggerList) {
+          const resBoolTriggers = [];
+          for (const t of booleanTriggerList) {
             const trigger = {
               automationId: id,
               deviceId: t.device,
-              on: t.value,
+              on: t.on,
             };
-            let resBoolean = await Endpoint.post(
+            resBoolTriggers.push(Endpoint.post(
               urlBooleanTrigger,
               {},
-              trigger
-            );
-            automation.triggers.push(resBoolean.data);
-            console.log("TRIGGERS: ", automation);
+              trigger,
+            ));
           }
+          automation.triggers.push(...((await Promise.all(resBoolTriggers)).map((v) => v.data)));
 
-          for (let [priority, sceneId] of order.entries()) {
+          // Conditions
+          const resRangeConditions = [];
+          for (const t of rangeConditionList) {
+            const condition = {
+              automationId: id,
+              deviceId: t.device,
+              operator: t.operand,
+              range: t.value,
+            };
+            resRangeConditions.push(Endpoint.post(urlRangeCondition, {}, condition));
+          }
+          automation.conditions = (await Promise.all(resRangeConditions)).map((v) => v.data);
+
+          const resBoolConditions = [];
+          for (const t of booleanConditionList) {
+            const condition = {
+              automationId: id,
+              deviceId: t.device,
+              on: t.on,
+            };
+            resBoolConditions.push(Endpoint.post(
+              urlBooleanCondition,
+              {},
+              condition,
+            ));
+          }
+          automation.conditions.push(...((await Promise.all(resBoolConditions)).map((v) => v.data)));
+
+          const resThermoConditions = [];
+          for (const t of thermostatConditionList) {
+            const condition = {
+              automationId: id,
+              deviceId: t.device,
+              mode: t.mode,
+              operator: t.operand,
+            };
+            resThermoConditions.push(Endpoint.post(
+              urlThermostatCondition,
+              {},
+              condition,
+            ));
+          }
+          automation.conditions.push(...((await Promise.all(resThermoConditions)).map((v) => v.data)));
+
+          const resScenePriorities = [];
+          for (const [priority, sceneId] of order.entries()) {
             const scenePriority = {
               automationId: id,
               priority,
               sceneId,
             };
-            let resScenes = await Endpoint["post"](
+            resScenePriorities.push(Endpoint.post(
               urlScenePriority,
               {},
-              scenePriority
-            );
-            automation.scenes.push(resScenes.data);
+              scenePriority,
+            ));
           }
+          automation.scenes = (await Promise.all(resScenePriorities)).map((v) => v.data);
           automation.id = id;
           dispatch(actions.automationSave(automation));
-        }
+        },
       );
     };
   },
@@ -590,22 +706,19 @@ export const RemoteService = {
    * @returns {Promise<Device, RemoteError>} promise that resolves to the saved device and rejects
    *  with user-fiendly errors as a RemoteError
    */
-  saveState: (data) => {
-    return (dispatch) => {
-      let url =
-        "/" + data.kind + "/" + data.id + "/state?sceneId=" + data.sceneId;
+  saveState: (data) => (dispatch) => {
+      const url = `/${data.kind}/${data.id}/state?sceneId=${data.sceneId}`;
 
-      return Endpoint["post"](url, {}, data)
+      return Endpoint.post(url, {}, data)
         .then((res) => {
           dispatch(actions.stateSave(res.data));
           return res.data;
         })
         .catch((err) => {
-          console.warn("Update device: ", data, "error: ", err);
-          throw new RemoteError(["Network error"]);
+          console.warn('Update device: ', data, 'error: ', err);
+          throw new RemoteError(['Network error']);
         });
-    };
-  },
+    },
 
   /**
    * Connetcs a series of output devices to an input device.
@@ -620,9 +733,8 @@ export const RemoteService = {
    * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
    *  with user-fiendly errors as a RemoteError
    */
-  connectOutputs: (newDevice, outputs) => {
-    return (dispatch) => {
-      let url = `/${newDevice.kind}/${newDevice.id}/lights`;
+  connectOutputs: (newDevice, outputs) => (dispatch) => {
+      const url = `/${newDevice.kind}/${newDevice.id}/lights`;
 
       return Endpoint.post(url, {}, outputs)
         .then((res) => {
@@ -631,34 +743,29 @@ export const RemoteService = {
         })
         .catch((err) => {
           console.warn(
-            "ConnectOutputs of ",
+            'ConnectOutputs of ',
             newDevice.id,
-            " with outputs: ",
+            ' with outputs: ',
             outputs,
-            "error: ",
-            err
+            'error: ',
+            err,
           );
-          throw new RemoteError(["Network error"]);
+          throw new RemoteError(['Network error']);
         });
-    };
-  },
+    },
 
-  _operateInput: (url, getUrl, action) => {
-    return (dispatch) => {
-      return Endpoint.put(url, {}, action)
+  _operateInput: (url, getUrl, action) => (dispatch) => Endpoint.put(url, {}, action)
         .then(async (res) => {
           const inputDevice = await Endpoint.get(getUrl);
           delete inputDevice.outputs;
           dispatch(
-            actions.deviceOperationUpdate([...res.data, inputDevice.data])
+            actions.deviceOperationUpdate([...res.data, inputDevice.data]),
           );
         })
         .catch((err) => {
           console.warn(`${url} error`, err);
-          throw new RemoteError(["Network error"]);
-        });
-    };
-  },
+          throw new RemoteError(['Network error']);
+        }),
 
   /**
    * Changes the state of a switch, by turning it on, off or toggling it.
@@ -670,16 +777,14 @@ export const RemoteService = {
    * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
    *  with user-fiendly errors as a RemoteError
    */
-  switchOperate: (switchId, type) => {
-    return RemoteService._operateInput(
-      "/switch/operate",
+  switchOperate: (switchId, type) => RemoteService._operateInput(
+      '/switch/operate',
       `/switch/${switchId}`,
       {
         type: type.toUpperCase(),
         id: switchId,
-      }
-    );
-  },
+      },
+    ),
 
   /**
    * Turns a knob dimmer to a specific amount
@@ -689,16 +794,14 @@ export const RemoteService = {
    * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
    *  with user-fiendly errors as a RemoteError
    */
-  knobDimmerDimTo: (dimmerId, intensity) => {
-    return RemoteService._operateInput(
-      "/knobDimmer/dimTo",
+  knobDimmerDimTo: (dimmerId, intensity) => RemoteService._operateInput(
+      '/knobDimmer/dimTo',
       `/knobDimmer/${dimmerId}`,
       {
         intensity,
         id: dimmerId,
-      }
-    );
-  },
+      },
+    ),
 
   /**
    * Turns a button dimmer up or down
@@ -710,16 +813,14 @@ export const RemoteService = {
    * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
    *  with user-fiendly errors as a RemoteError
    */
-  buttonDimmerDim: (dimmerId, dimType) => {
-    return RemoteService._operateInput(
-      "/buttonDimmer/dim",
+  buttonDimmerDim: (dimmerId, dimType) => RemoteService._operateInput(
+      '/buttonDimmer/dim',
       `/buttonDimmer/${dimmerId}`,
       {
         dimType,
         id: dimmerId,
-      }
-    );
-  },
+      },
+    ),
 
   /**
    * Resets the meter on a smart plug
@@ -729,14 +830,12 @@ export const RemoteService = {
    *  with user-fiendly errors as a RemoteError
    */
   smartPlugReset(smartPlugId) {
-    return (dispatch) => {
-      return Endpoint.delete(`/smartPlug/${smartPlugId}/meter`)
+    return (dispatch) => Endpoint.delete(`/smartPlug/${smartPlugId}/meter`)
         .then((res) => dispatch(actions.deviceOperationUpdate([res.data])))
         .catch((err) => {
-          console.warn(`Smartplug reset error`, err);
-          throw new RemoteError(["Network error"]);
+          console.warn('Smartplug reset error', err);
+          throw new RemoteError(['Network error']);
         });
-    };
   },
   /**
    * Deletes a room
@@ -744,27 +843,21 @@ export const RemoteService = {
    * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
    *  with user-fiendly errors as a RemoteError
    */
-  deleteRoom: (roomId) => {
-    return (dispatch) => {
-      return Endpoint.delete(`/room/${roomId}`)
+  deleteRoom: (roomId) => (dispatch) => Endpoint.delete(`/room/${roomId}`)
         .then((_) => dispatch(actions.roomDelete(roomId)))
         .catch((err) => {
-          console.warn("Room deletion error", err);
-          throw new RemoteError(["Network error"]);
-        });
-    };
-  },
+          console.warn('Room deletion error', err);
+          throw new RemoteError(['Network error']);
+        }),
 
   deleteAutomation: (id) => {
-    console.log("ID OF AUTO ", id);
-    return (dispatch) => {
-      return Endpoint.delete(`/automation/${id}`)
+    console.log('ID OF AUTO ', id);
+    return (dispatch) => Endpoint.delete(`/automation/${id}`)
         .then((_) => dispatch(actions.automationDelete(id)))
         .catch((err) => {
-          console.warn("Automation deletion error", err);
-          throw new RemoteError(["Network error"]);
+          console.warn('Automation deletion error', err);
+          throw new RemoteError(['Network error']);
         });
-    };
   },
 
   /**
@@ -773,16 +866,12 @@ export const RemoteService = {
    * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
    *  with user-fiendly errors as a RemoteError
    */
-  deleteScene: (sceneId) => {
-    return (dispatch) => {
-      return Endpoint.delete(`/scene/${sceneId}`)
+  deleteScene: (sceneId) => (dispatch) => Endpoint.delete(`/scene/${sceneId}`)
         .then((_) => dispatch(actions.sceneDelete(sceneId)))
         .catch((err) => {
-          console.warn("Scene deletion error", err);
-          throw new RemoteError(["Network error"]);
-        });
-    };
-  },
+          console.warn('Scene deletion error', err);
+          throw new RemoteError(['Network error']);
+        }),
 
   /**
    * Deletes a device
@@ -790,16 +879,12 @@ export const RemoteService = {
    * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
    *  with user-fiendly errors as a RemoteError
    */
-  deleteDevice: (device) => {
-    return (dispatch) => {
-      return Endpoint.delete(`/${device.kind}/${device.id}`)
+  deleteDevice: (device) => (dispatch) => Endpoint.delete(`/${device.kind}/${device.id}`)
         .then((_) => dispatch(actions.deviceDelete(device.id)))
         .catch((err) => {
-          console.warn("Device deletion error", err);
-          throw new RemoteError(["Network error"]);
-        });
-    };
-  },
+          console.warn('Device deletion error', err);
+          throw new RemoteError(['Network error']);
+        }),
 };
 
 for (const key in RemoteService) {
@@ -807,6 +892,15 @@ for (const key in RemoteService) {
 }
 
 export class Forms {
+  static fetchAllUsers() {
+    return Endpoint.get('/user')
+      .then((res) => res.data)
+      .catch((err) => {
+        console.error('Fetch users error', err);
+        throw new RemoteError(['Network error']);
+      });
+  }
+
   /**
    * Attempts to create a new user from the given data.
    * This method does not update the global state,
@@ -820,14 +914,14 @@ export class Forms {
    */
   static submitRegistration(data) {
     return Endpoint.postNA(
-      "/register",
+      '/register',
       {},
       {
         username: data.username,
         password: data.password,
         name: data.name,
         email: data.email,
-      }
+      },
     )
       .then((_) => void 0)
       .catch(parseValidationErrors);
@@ -843,16 +937,16 @@ export class Forms {
    */
   static submitInitResetPassword(email) {
     return Endpoint.postNA(
-      "/register/init-reset-password",
+      '/register/init-reset-password',
       {},
       {
-        email: email,
-      }
+        email,
+      },
     )
       .then((_) => void 0)
       .catch((err) => {
-        console.warn("Init reset password failed", err);
-        throw new RemoteError(["Network error"]);
+        console.warn('Init reset password failed', err);
+        throw new RemoteError(['Network error']);
       });
   }
 
@@ -868,12 +962,12 @@ export class Forms {
    */
   static submitResetPassword(confirmationToken, password) {
     return Endpoint.putNA(
-      "/register/reset-password",
+      '/register/reset-password',
       {},
       {
         confirmationToken,
         password,
-      }
+      },
     )
       .then((_) => void 0)
       .catch(parseValidationErrors);
diff --git a/smart-hut/src/serviceWorker.js b/smart-hut/src/serviceWorker.js
index c7cd666..a034430 100644
--- a/smart-hut/src/serviceWorker.js
+++ b/smart-hut/src/serviceWorker.js
@@ -11,17 +11,17 @@
 // opt-in, read https://bit.ly/CRA-PWA
 
 const isLocalhost = Boolean(
-  window.location.hostname === "localhost" ||
+  window.location.hostname === 'localhost'
     // [::1] is the IPv6 localhost address.
-    window.location.hostname === "[::1]" ||
+    || window.location.hostname === '[::1]'
     // 127.0.0.0/8 are considered localhost for IPv4.
-    window.location.hostname.match(
-      /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
-    )
+    || window.location.hostname.match(
+      /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/,
+    ),
 );
 
 export function register(config) {
-  if (process.env.NODE_ENV === "production" && "serviceWorker" in navigator) {
+  if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
     // The URL constructor is available in all browsers that support SW.
     const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
     if (publicUrl.origin !== window.location.origin) {
@@ -31,7 +31,7 @@ export function register(config) {
       return;
     }
 
-    window.addEventListener("load", () => {
+    window.addEventListener('load', () => {
       const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
 
       if (isLocalhost) {
@@ -42,8 +42,8 @@ export function register(config) {
         // service worker/PWA documentation.
         navigator.serviceWorker.ready.then(() => {
           console.log(
-            "This web app is being served cache-first by a service " +
-              "worker. To learn more, visit https://bit.ly/CRA-PWA"
+            'This web app is being served cache-first by a service '
+              + 'worker. To learn more, visit https://bit.ly/CRA-PWA',
           );
         });
       } else {
@@ -64,14 +64,14 @@ function registerValidSW(swUrl, config) {
           return;
         }
         installingWorker.onstatechange = () => {
-          if (installingWorker.state === "installed") {
+          if (installingWorker.state === 'installed') {
             if (navigator.serviceWorker.controller) {
               // At this point, the updated precached content has been fetched,
               // but the previous service worker will still serve the older
               // content until all client tabs are closed.
               console.log(
-                "New content is available and will be used when all " +
-                  "tabs for this page are closed. See https://bit.ly/CRA-PWA."
+                'New content is available and will be used when all '
+                  + 'tabs for this page are closed. See https://bit.ly/CRA-PWA.',
               );
 
               // Execute callback
@@ -82,7 +82,7 @@ function registerValidSW(swUrl, config) {
               // At this point, everything has been precached.
               // It's the perfect time to display a
               // "Content is cached for offline use." message.
-              console.log("Content is cached for offline use.");
+              console.log('Content is cached for offline use.');
 
               // Execute callback
               if (config && config.onSuccess) {
@@ -94,21 +94,21 @@ function registerValidSW(swUrl, config) {
       };
     })
     .catch((error) => {
-      console.error("Error during service worker registration:", error);
+      console.error('Error during service worker registration:', error);
     });
 }
 
 function checkValidServiceWorker(swUrl, config) {
   // Check if the service worker can be found. If it can't reload the page.
   fetch(swUrl, {
-    headers: { "Service-Worker": "script" },
+    headers: { 'Service-Worker': 'script' },
   })
     .then((response) => {
       // Ensure service worker exists, and that we really are getting a JS file.
-      const contentType = response.headers.get("content-type");
+      const contentType = response.headers.get('content-type');
       if (
-        response.status === 404 ||
-        (contentType != null && contentType.indexOf("javascript") === -1)
+        response.status === 404
+        || (contentType != null && contentType.indexOf('javascript') === -1)
       ) {
         // No service worker found. Probably a different app. Reload the page.
         navigator.serviceWorker.ready.then((registration) => {
@@ -123,13 +123,13 @@ function checkValidServiceWorker(swUrl, config) {
     })
     .catch(() => {
       console.log(
-        "No internet connection found. App is running in offline mode."
+        'No internet connection found. App is running in offline mode.',
       );
     });
 }
 
 export function unregister() {
-  if ("serviceWorker" in navigator) {
+  if ('serviceWorker' in navigator) {
     navigator.serviceWorker.ready
       .then((registration) => {
         registration.unregister();
diff --git a/smart-hut/src/setupTests.js b/smart-hut/src/setupTests.js
index 5fdf001..74b1a27 100644
--- a/smart-hut/src/setupTests.js
+++ b/smart-hut/src/setupTests.js
@@ -2,4 +2,4 @@
 // allows you to do things like:
 // expect(element).toHaveTextContent(/react/i)
 // learn more: https://github.com/testing-library/jest-dom
-import "@testing-library/jest-dom/extend-expect";
+import '@testing-library/jest-dom/extend-expect';
diff --git a/smart-hut/src/store.js b/smart-hut/src/store.js
index eade971..60b9e9f 100644
--- a/smart-hut/src/store.js
+++ b/smart-hut/src/store.js
@@ -1,11 +1,12 @@
-import { createStore, applyMiddleware, compose } from "redux";
-import thunk from "redux-thunk";
-import update from "immutability-helper";
-import reduxWebSocket, { connect } from "@giantmachines/redux-websocket";
-import { socketURL } from "./endpoint";
+import { createStore, applyMiddleware, compose } from 'redux';
+import thunk from 'redux-thunk';
+import update from 'immutability-helper';
+import reduxWebSocket, { connect } from '@giantmachines/redux-websocket';
+import { socketURL } from './endpoint';
 
 function reducer(previousState, action) {
-  let newState, change;
+  let newState; let
+change;
 
   const createOrUpdateRoom = (room) => {
     if (!newState.rooms[room.id]) {
@@ -48,6 +49,8 @@ function reducer(previousState, action) {
         scenes: {
           [scene.id]: {
             name: { $set: scene.name },
+            icon: { $set: scene.icon },
+            guestAccessEnabled: { $set: scene.guestAccessEnabled },
           },
         },
       });
@@ -87,33 +90,60 @@ function reducer(previousState, action) {
   };
 
   switch (action.type) {
-    case "LOGIN_UPDATE":
+    case 'LOGIN_UPDATE':
       newState = update(previousState, { login: { $set: action.login } });
       break;
-    case "USER_INFO_UPDATE":
-      newState = update(previousState, { userInfo: { $set: action.userInfo } });
+    case 'USER_INFO_UPDATE':
+      newState = update(previousState, {
+        userInfo: { $set: action.userInfo },
+      });
       break;
-    case "ROOMS_UPDATE":
+    case 'ROOMS_UPDATE':
       newState = previousState;
       for (const room of action.rooms) {
         createOrUpdateRoom(room);
       }
       break;
-    case "SCENES_UPDATE":
+    case 'HOST_ROOMS_UPDATE':
+      change = {
+        hostRooms: {
+          [action.hostId]: { $set: {} },
+        },
+      };
+      const rooms = change.hostRooms[action.hostId].$set;
+
+      for (const room of action.rooms) {
+        rooms[room.id] = room;
+      }
+
+      newState = update(previousState, change);
+      break;
+    case 'SCENES_UPDATE':
       newState = previousState;
       for (const scene of action.scenes) {
         createOrUpdateScene(scene);
       }
       break;
-    case "STATES_UPDATE":
-      //console.log(action.sceneStates);
+    case 'HOST_SCENES_UPDATE':
+      change = {
+        hostScenes: {
+          [action.hostId]: { $set: action.scenes }, // stored as array
+        },
+      };
+
+      newState = update(previousState, change);
+      break;
+    case 'STATES_UPDATE':
+      // console.log(action.sceneStates);
       change = null;
 
-      // if room is given, delete all devices in that room
-      // and remove any join between that room and deleted
-      // devices
+      // if scene is given, delete all sceneStates in that scene
+      // and remove any join between that scene and deleted
+      // sceneStates
       change = {
-        scenes: { [action.sceneId]: { sceneStates: { $set: new Set() } } },
+        scenes: {
+          [action.sceneId]: { sceneStates: { $set: new Set() } },
+        },
         sceneStates: { $unset: [] },
       };
 
@@ -140,11 +170,9 @@ function reducer(previousState, action) {
         }
 
         if (sceneState.sceneId in newState.scenes) {
-          change.scenes[sceneState.sceneId] =
-            change.scenes[sceneState.sceneId] || {};
-          change.scenes[sceneState.sceneId].sceneStates =
-            change.scenes[sceneState.sceneId].sceneStates || {};
-          const sceneStates = change.scenes[sceneState.sceneId].sceneStates;
+          change.scenes[sceneState.sceneId] = change.scenes[sceneState.sceneId] || {};
+          change.scenes[sceneState.sceneId].sceneStates = change.scenes[sceneState.sceneId].sceneStates || {};
+          const { sceneStates } = change.scenes[sceneState.sceneId];
           sceneStates.$add = sceneStates.$add || [];
           sceneStates.$add.push(sceneState.id);
         } else {
@@ -157,7 +185,7 @@ function reducer(previousState, action) {
             };
           } else {
             change.pendingJoins.scenes[sceneState.sceneId].$set.add(
-              sceneState.id
+              sceneState.id,
             );
           }
         }
@@ -166,7 +194,7 @@ function reducer(previousState, action) {
       newState = update(newState, change);
 
       break;
-    case "DEVICES_UPDATE":
+    case 'DEVICES_UPDATE':
       change = null;
 
       // if room is given, delete all devices in that room
@@ -174,7 +202,9 @@ function reducer(previousState, action) {
       // devices
       if (action.roomId) {
         change = {
-          rooms: { [action.roomId]: { devices: { $set: new Set() } } },
+          rooms: {
+            [action.roomId]: { devices: { $set: new Set() } },
+          },
           devices: { $unset: [] },
         };
 
@@ -194,7 +224,7 @@ function reducer(previousState, action) {
         for (const device of action.devices) {
           if (!previousState.devices[device.id]) continue;
           change.devices.$unset.push(device.id);
-          const roomId = previousState.devices[device.id].roomId;
+          const { roomId } = previousState.devices[device.id];
 
           if (roomId in previousState.rooms) {
             change.rooms[roomId] = change.rooms[roomId] || {
@@ -234,9 +264,8 @@ function reducer(previousState, action) {
 
         if (device.roomId in newState.rooms) {
           change.rooms[device.roomId] = change.rooms[device.roomId] || {};
-          change.rooms[device.roomId].devices =
-            change.rooms[device.roomId].devices || {};
-          const devices = change.rooms[device.roomId].devices;
+          change.rooms[device.roomId].devices = change.rooms[device.roomId].devices || {};
+          const { devices } = change.rooms[device.roomId];
           devices.$add = devices.$add || [];
           devices.$add.push(device.id);
         } else {
@@ -255,9 +284,27 @@ function reducer(previousState, action) {
 
       newState = update(newState, change);
       break;
+    case 'HOST_DEVICES_UPDATE':
+      newState = action.partial
+        ? previousState
+        : update(previousState, {
+            hostDevices: { [action.hostId]: { $set: {} } },
+          });
+      newState.hostDevices[action.hostId] = newState.hostDevices[action.hostId] || {};
+      change = {
+        hostDevices: {
+          [action.hostId]: {},
+        },
+      };
+      const deviceMap = change.hostDevices[action.hostId];
 
-    case "AUTOMATION_UPDATE":
-      newState = previousState;
+      for (const device of action.devices) {
+        deviceMap[device.id] = { $set: device };
+      }
+
+      newState = update(newState, change);
+      break;
+    case 'AUTOMATION_UPDATE':
       const automations = {};
       for (const automation of action.automations) {
         automations[automation.id] = automation;
@@ -268,15 +315,15 @@ function reducer(previousState, action) {
       };
       newState = update(previousState, change);
       break;
-    case "ROOM_SAVE":
+    case 'ROOM_SAVE':
       newState = previousState;
       createOrUpdateRoom(action.room);
       break;
-    case "SCENE_SAVE":
+    case 'SCENE_SAVE':
       newState = previousState;
       createOrUpdateScene(action.scene);
       break;
-    case "DEVICE_SAVE":
+    case 'DEVICE_SAVE':
       change = {
         devices: { [action.device.id]: { $set: action.device } },
       };
@@ -300,24 +347,48 @@ function reducer(previousState, action) {
       }
       newState = update(previousState, change);
       break;
-
-    case "AUTOMATION_SAVE":
-      console.log("ID: ", action.automation.id);
+    case 'HOST_DEVICE_SAVE':
       change = {
-        automations: { [action.automation.id]: { $set: action.automation } },
+        hostDevices: {
+          [action.hostId]: {
+            [action.device.id]: {
+              $set: action.device,
+            },
+          },
+        },
+      };
+      newState = update(previousState, change);
+      break;
+    case 'HOST_DEVICES_DELETE':
+      change = {
+        hostDevices: {
+          [action.hostId]: {
+            $unset: [action.deviceIds],
+          },
+        },
+      };
+      newState = update(previousState, change);
+      break;
+
+    case 'AUTOMATION_SAVE':
+      change = {
+        automations: {
+          [action.automation.id]: { $set: action.automation },
+        },
       };
 
       newState = update(previousState, change);
 
       break;
 
-    case "STATE_SAVE":
+    case 'STATE_SAVE':
       change = {
-        sceneStates: { [action.sceneState.id]: { $set: action.sceneState } },
+        sceneStates: {
+          [action.sceneState.id]: { $set: action.sceneState },
+        },
       };
 
       if (previousState.scenes[action.sceneState.sceneId]) {
-        console.log("PREVSTATE", change, previousState);
         change.scenes = {
           [action.sceneState.sceneId]: {
             sceneStates: {
@@ -335,9 +406,8 @@ function reducer(previousState, action) {
         };
       }
       newState = update(previousState, change);
-      console.log("NEWSTATE ", newState);
       break;
-    case "ROOM_DELETE":
+    case 'ROOM_DELETE':
       if (!(action.roomId in previousState.rooms)) {
         console.warn(`Room to delete ${action.roomId} does not exist`);
         break;
@@ -361,18 +431,14 @@ function reducer(previousState, action) {
       newState = update(previousState, change);
       break;
 
-    case "AUTOMATION_DELETE":
+    case 'AUTOMATION_DELETE':
       change = {
         automations: { $unset: [action.id] },
       };
 
-      console.log("CHANGE ", change);
-      console.log("Action id: ", action.id);
       newState = update(previousState, change);
-      console.log("NEW STATE ", newState);
       break;
-    case "SCENE_DELETE":
-      console.log("SCENE", action.sceneId);
+    case 'SCENE_DELETE':
       if (!(action.sceneId in previousState.scenes)) {
         console.warn(`Scene to delete ${action.sceneId} does not exist`);
         break;
@@ -381,7 +447,7 @@ function reducer(previousState, action) {
       // This update does not ensure the consistent update of switchId/dimmerId properties
       // on output devices connected to an input device in this room. Please manually request
       // all devices again if consistent update is desired
-      change = { states: { $unset: [] } };
+      change = { sceneStates: { $unset: [] } };
 
       for (const id of previousState.scenes[action.sceneId].sceneStates) {
         change.sceneStates.$unset.push(id);
@@ -395,7 +461,7 @@ function reducer(previousState, action) {
 
       newState = update(previousState, change);
       break;
-    case "STATE_DELETE":
+    case 'STATE_DELETE':
       if (!(action.stateId in previousState.sceneStates)) {
         console.warn(`State to delete ${action.stateId} does not exist`);
         break;
@@ -418,16 +484,7 @@ function reducer(previousState, action) {
       newState = update(previousState, change);
       break;
 
-    case "SCENE_APPLY":
-      console.log(action);
-      //checking that the scene actually exists
-      /*if (!(action.sceneId in previousState.scenes)) {
-        console.warn(`Scene ${action.sceneId} does not exist`);
-        break;
-      }*/
-
-      break;
-    case "DEVICE_DELETE":
+    case 'DEVICE_DELETE':
       if (!(action.deviceId in previousState.devices)) {
         console.warn(`Device to delete ${action.deviceId} does not exist`);
         break;
@@ -447,59 +504,69 @@ function reducer(previousState, action) {
 
       newState = update(previousState, change);
       break;
-    case "LOGOUT":
+    case 'LOGOUT':
       newState = update(initState, {});
       break;
-    case "SET_ACTIVE_ROOM":
+    case 'SET_ACTIVE':
       newState = update(previousState, {
         active: {
-          activeRoom: {
-            $set: action.activeRoom,
+          [action.key]: {
+            $set: action.value,
           },
         },
       });
       break;
-    case "SET_ACTIVE_TAB":
-      newState = update(previousState, {
-        active: {
-          activeTab: {
-            $set: action.activeTab,
-          },
-        },
-      });
-      break;
-    case "SET_ACTIVE_SCENE":
-      newState = update(previousState, {
-        active: {
-          activeScene: {
-            $set: action.activeScene,
-          },
-        },
-      });
-      break;
-    case "SET_ACTIVE_AUTOMATION":
-      newState = update(previousState, {
-        active: {
-          activeAutomation: {
-            $set: action.activeAutomation,
-          },
-        },
-      });
-      break;
-    case "REDUX_WEBSOCKET::MESSAGE":
-      const devices = JSON.parse(action.payload.message);
-
+    case 'REDUX_WEBSOCKET::MESSAGE':
+      const allDevices = JSON.parse(action.payload.message);
+      const devices = allDevices.filter(
+        (d) => (d.fromHostId === null || d.fromHostId === undefined) && !d.deleted,
+      );
+      const hostDevicesMapByHostId = allDevices
+        .filter((d) => d.fromHostId)
+        .reduce((a, e) => {
+          const hostId = e.fromHostId;
+          // delete e.fromHostId;
+          a[hostId] = a[hostId] || { updated: [], deletedIds: [] };
+          if (e.deleted) {
+            a[hostId].deletedIds.push(e.id);
+          } else {
+            a[hostId].updated.push(e);
+          }
+          return a;
+        }, {});
       newState = reducer(previousState, {
-        type: "DEVICES_UPDATE",
+        type: 'DEVICES_UPDATE',
         partial: true,
         devices,
       });
+      for (const hostId in hostDevicesMapByHostId) {
+        if (hostDevicesMapByHostId[hostId].updated.length > 0) {
+ newState = reducer(newState, {
+            type: 'HOST_DEVICES_UPDATE',
+            devices: hostDevicesMapByHostId[hostId].updated,
+            partial: true,
+            hostId,
+          });
+}
+        if (hostDevicesMapByHostId[hostId].deletedIds.length > 0) {
+          newState = reducer(newState, {
+            type: 'HOST_DEVICES_DELETE',
+            deviceIds: hostDevicesMapByHostId[hostId].deletedIds,
+            partial: true,
+            hostId,
+          });
+        }
+      }
+      break;
+    case 'HG_UPDATE':
+      newState = update(previousState, {
+        [action.key]: { $set: action.value },
+      });
       break;
     default:
       console.warn(`Action type ${action.type} unknown`, action);
       return previousState;
   }
-  console.log("THETRUEALPACA", newState, action.type, action);
   return newState;
 }
 
@@ -511,9 +578,10 @@ const initState = {
   },
   active: {
     activeRoom: -1,
-    activeTab: "Devices",
+    activeTab: 'Devices',
     activeScene: -1,
     activeAutomation: -1,
+    activeHost: -1,
   },
   login: {
     loggedIn: false,
@@ -524,17 +592,26 @@ const initState = {
   rooms: {},
   /** @type {[integer]Scene} */
   scenes: {},
+  hostScenes: {},
   /** @type {[integer]Automation} */
   automations: {},
   /** @type {[integer]Device} */
   devices: {},
   /** @type {[integer]SceneState} */
   sceneStates: {},
+  /** @type {User[]} */
+  guests: [],
+  /** @type {User[]} */
+  hosts: [],
+  /** @type {[integer]Device} */
+  hostDevices: {},
+  /** @type {[integer]Eoom} */
+  hostRooms: {},
 };
 
 function createSmartHutStore() {
-  const token = localStorage.getItem("token");
-  const exp = localStorage.getItem("exp");
+  const token = localStorage.getItem('token');
+  const exp = localStorage.getItem('exp');
 
   const initialState = update(initState, {
     login: {
@@ -544,15 +621,15 @@ function createSmartHutStore() {
   });
 
   if (!initialState.login.loggedIn) {
-    localStorage.removeItem("token");
-    localStorage.removeItem("exp");
+    localStorage.removeItem('token');
+    localStorage.removeItem('exp');
     initialState.login.token = null;
   }
 
   const store = createStore(
     reducer,
     initialState,
-    compose(applyMiddleware(thunk), applyMiddleware(reduxWebSocket()))
+    compose(applyMiddleware(thunk), applyMiddleware(reduxWebSocket())),
   );
   if (initialState.login.loggedIn) {
     store.dispatch(connect(socketURL(token)));
diff --git a/smart-hut/src/storeActions.js b/smart-hut/src/storeActions.js
index 86ac83e..77ca199 100644
--- a/smart-hut/src/storeActions.js
+++ b/smart-hut/src/storeActions.js
@@ -1,119 +1,159 @@
 const actions = {
   loginSuccess: (token) => ({
-    type: "LOGIN_UPDATE",
+    type: 'LOGIN_UPDATE',
     login: {
       loggedIn: true,
       token,
     },
   }),
   logout: () => ({
-    type: "LOGOUT",
+    type: 'LOGOUT',
   }),
   userInfoUpdate: (userInfo) => ({
-    type: "USER_INFO_UPDATE",
+    type: 'USER_INFO_UPDATE',
     userInfo,
   }),
   roomSave: (room) => ({
-    type: "ROOM_SAVE",
+    type: 'ROOM_SAVE',
     room,
   }),
   sceneSave: (scene) => ({
-    type: "SCENE_SAVE",
+    type: 'SCENE_SAVE',
     scene,
   }),
   deviceSave: (device) => ({
-    type: "DEVICE_SAVE",
+    type: 'DEVICE_SAVE',
+    device,
+  }),
+  hostDeviceSave: (hostId, device) => ({
+    type: 'HOST_DEVICE_SAVE',
+    hostId,
     device,
   }),
   triggerSave: (automation) => ({
-    type: "TRIGGER_SAVE",
+    type: 'TRIGGER_SAVE',
     automation,
   }),
 
   scenePrioritySave: (automation) => ({
-    type: "SCENE_PRIORITY_SAVE",
+    type: 'SCENE_PRIORITY_SAVE',
     automation,
   }),
 
   automationSave: (automation) => ({
-    type: "AUTOMATION_SAVE",
+    type: 'AUTOMATION_SAVE',
     automation,
   }),
   automationsUpdate: (automations) => ({
-    type: "AUTOMATION_UPDATE",
+    type: 'AUTOMATION_UPDATE',
     automations,
   }),
   stateSave: (sceneState) => ({
-    type: "STATE_SAVE",
+    type: 'STATE_SAVE',
     sceneState,
   }),
   statesUpdate: (sceneId, sceneStates) => ({
-    type: "STATES_UPDATE",
+    type: 'STATES_UPDATE',
     sceneId,
     sceneStates,
   }),
   devicesUpdate: (roomId, devices, partial = false) => ({
-    type: "DEVICES_UPDATE",
+    type: 'DEVICES_UPDATE',
     roomId,
     devices,
     partial,
   }),
+  hostDevicesUpdate: (hostId, devices, partial = false) => ({
+    type: 'HOST_DEVICES_UPDATE',
+    hostId,
+    partial,
+    devices,
+  }),
   stateDelete: (stateId) => ({
-    type: "STATE_DELETE",
+    type: 'STATE_DELETE',
     stateId,
   }),
-  sceneApply: (sceneId) => ({
-    type: "SCENE_APPLY",
-    sceneId,
-  }),
   deviceOperationUpdate: (devices) => ({
-    type: "DEVICES_UPDATE",
+    type: 'DEVICES_UPDATE',
     devices,
     partial: true,
   }),
   roomsUpdate: (rooms) => ({
-    type: "ROOMS_UPDATE",
+    type: 'ROOMS_UPDATE',
+    rooms,
+  }),
+  hostRoomsUpdate: (hostId, rooms) => ({
+    type: 'HOST_ROOMS_UPDATE',
+    hostId,
     rooms,
   }),
   roomDelete: (roomId) => ({
-    type: "ROOM_DELETE",
+    type: 'ROOM_DELETE',
     roomId,
   }),
   automationDelete: (id) => ({
-    type: "AUTOMATION_DELETE",
+    type: 'AUTOMATION_DELETE',
     id,
   }),
   sceneDelete: (sceneId) => ({
-    type: "SCENE_DELETE",
+    type: 'SCENE_DELETE',
     sceneId,
   }),
   scenesUpdate: (scenes) => ({
-    type: "SCENES_UPDATE",
+    type: 'SCENES_UPDATE',
+    scenes,
+  }),
+  hostScenesUpdate: (hostId, scenes) => ({
+    type: 'HOST_SCENES_UPDATE',
+    hostId,
     scenes,
   }),
   deviceDelete: (deviceId) => ({
-    type: "DEVICE_DELETE",
+    type: 'DEVICE_DELETE',
     deviceId,
   }),
+  hostsUpdate: (hosts) => ({
+    type: 'HG_UPDATE',
+    key: 'hosts',
+    value: hosts,
+  }),
+  guestsUpdate: (hosts) => ({
+    type: 'HG_UPDATE',
+    key: 'guests',
+    value: hosts,
+  }),
+  getHostDevices: (host) => ({
+    type: 'GET_HOST_DEVICES',
+    host,
+  }),
+  guestUpdate: (guests) => ({
+    type: 'HG_UPDATE',
+    key: 'guests',
+    value: guests,
+  }),
 };
 
 export const appActions = {
   // -1 for home view
   setActiveRoom: (activeRoom = -1) => ({
-    type: "SET_ACTIVE_ROOM",
-    activeRoom,
+    type: 'SET_ACTIVE',
+    key: 'activeRoom',
+    value: activeRoom,
   }),
   setActiveTab: (activeTab) => ({
-    type: "SET_ACTIVE_TAB",
-    activeTab,
+    type: 'SET_ACTIVE',
+    key: 'activeTab',
+    value: activeTab,
   }),
   setActiveScene: (activeScene = -1) => ({
-    type: "SET_ACTIVE_SCENE",
-    activeScene,
+    type: 'SET_ACTIVE',
+    key: 'activeScene',
+    value: activeScene,
   }),
-  setActiveAutomations: (activeAutomation = -1) => ({
-    type: "SET_ACTIVE_AUTOMATION",
-    activeAutomation,
+  setActiveHost: (activeHost = -1) => ({
+    type: 'SET_ACTIVE',
+    key: 'activeHost',
+    value: activeHost,
   }),
 };
 
diff --git a/smart-hut/src/views/AutomationsNavbar.js b/smart-hut/src/views/AutomationsNavbar.js
deleted file mode 100644
index 3378a90..0000000
--- a/smart-hut/src/views/AutomationsNavbar.js
+++ /dev/null
@@ -1,165 +0,0 @@
-import React, { Component } from "react";
-import {
-  Menu,
-  Button,
-  Grid,
-  Icon,
-  Responsive,
-  Dropdown,
-} from "semantic-ui-react";
-import { editButtonStyle } from "../components/dashboard/devices/styleComponents";
-import AutomationModal from "../components/AutomationModal";
-import { RemoteService } from "../remote";
-import { connect } from "react-redux";
-import { appActions } from "../storeActions";
-
-class AutomationsNavbar extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      editMode: false,
-    };
-
-    this.toggleEditMode = this.toggleEditMode.bind(this);
-    this.openCurrentModalMobile = this.openCurrentModalMobile.bind(this);
-  }
-
-  get activeItemAutomation() {
-    return this.props.activeAutomation;
-  }
-
-  set activeItemAutomation(item) {
-    this.props.setActiveAutomation(item);
-  }
-
-  get activeItemAutomationsName() {
-    if (this.props.activeAutomation === -1) return "Home";
-    return this.props.automations[this.props.activeAutomation].name;
-  }
-
-  openCurrentModalMobile() {
-    console.log(this.activeItemAutomation, this.props.automationsModalRefs);
-    const currentModal = this.props.automationsModalRefs[
-      this.activeItemAutomation
-    ].current;
-    currentModal.openModal();
-  }
-
-  toggleEditMode(e) {
-    this.setState((prevState) => ({ editMode: !prevState.editMode }));
-  }
-
-  render() {
-    return (
-      <div style={{ background: "#1b1c1d!important", padding: "0 20px" }}>
-        <Responsive minWidth={768}>
-          <Grid>
-            <Grid.Row color="black">
-              <button style={editButtonStyle} onClick={this.toggleEditMode}>
-                Edit
-              </button>
-            </Grid.Row>
-            <Grid.Row>
-              <Menu inverted fluid vertical>
-                <Menu.Item
-                  key={-1}
-                  id={null}
-                  name="automations"
-                  active={this.activeItemAutomation === -1}
-                  onClick={this.selectAutomations}
-                >
-                  <Grid>
-                    <Grid.Row>
-                      <Grid.Column>
-                        <Icon name="home" size="small" />
-                      </Grid.Column>
-                      <Grid.Column>AUTOMATIONS</Grid.Column>
-                    </Grid.Row>
-                  </Grid>
-                </Menu.Item>
-                {
-                  //INSERT LIST OF AUTOMATIONS HERE
-                }
-                <Menu.Item name="newM">
-                  <Grid>
-                    <Grid.Row centered name="new">
-                      <AutomationModal id={null} />
-                    </Grid.Row>
-                  </Grid>
-                </Menu.Item>
-              </Menu>
-            </Grid.Row>
-          </Grid>
-        </Responsive>
-
-        <Responsive maxWidth={768}>
-          <Menu>
-            <Dropdown item fluid text={this.activeItemAutomationName}>
-              <Dropdown.Menu>
-                <Dropdown.Item
-                  key={-1}
-                  id={null}
-                  name="scene"
-                  active={this.activeItemAutomation === -1}
-                  onClick={this.selectAutomations}
-                >
-                  <Grid>
-                    <Grid.Row>
-                      <Grid.Column>
-                        <Icon name="home" size="small" />
-                      </Grid.Column>
-                      <Grid.Column>Automations</Grid.Column>
-                    </Grid.Row>
-                  </Grid>
-                </Dropdown.Item>
-
-                {
-                  //INSERT LIST OF AUTOMATIONS HERE
-                }
-              </Dropdown.Menu>
-            </Dropdown>
-          </Menu>
-          <Grid inverted>
-            <Grid.Row>
-              <Grid.Column width={8}>
-                <AutomationModal id={null} />
-              </Grid.Column>
-              {this.activeItemAutomation !== -1 ? (
-                <Grid.Column width={8}>
-                  <Button
-                    icon
-                    fluid
-                    labelPosition="left"
-                    onClick={this.openCurrentModalMobile}
-                  >
-                    <Icon name="pencil" size="small" />
-                    EDIT AUTOMATION
-                  </Button>
-                </Grid.Column>
-              ) : null}
-            </Grid.Row>
-          </Grid>
-        </Responsive>
-      </div>
-    );
-  }
-}
-
-const setActiveAutomation = (activeAutomation) => {
-  return (dispatch) =>
-    dispatch(appActions.setActiveAutomation(activeAutomation));
-};
-
-const mapStateToProps = (state, _) => ({
-  automations: state.automations,
-  activeAutomation: state.active.activeAutomation,
-  automationModalRefs: Object.keys(state.automations).reduce(
-    (acc, key) => ({ ...acc, [key]: React.createRef() }),
-    {}
-  ),
-});
-const AutomationsNavbarContainer = connect(mapStateToProps, {
-  ...RemoteService,
-  setActiveAutomation,
-})(AutomationsNavbar);
-export default AutomationsNavbarContainer;
diff --git a/smart-hut/src/views/Confirm.js b/smart-hut/src/views/Confirm.js
new file mode 100644
index 0000000..2003fdf
--- /dev/null
+++ b/smart-hut/src/views/Confirm.js
@@ -0,0 +1,39 @@
+import React, { Component } from 'react';
+import {
+  Image,
+  Grid,
+  Button,
+  Icon,
+  Header,
+  Container,
+} from 'semantic-ui-react';
+
+export default class Confirm extends Component {
+  render() {
+    return (
+      <>
+        <Button circular style={{ margin: '2em' }} href="/">
+          <Icon name="arrow alternate circle left" />
+          Go Home
+          {' '}
+        </Button>
+        <Grid
+          textAlign="center"
+          style={{ height: '70vh' }}
+          verticalAlign="middle"
+        >
+          <Grid.Column style={{ maxWidth: 450 }}>
+            <Header as="h2" color="blue" textAlign="center">
+              <Image src="img/logo.png" />
+              {' '}
+Congratulation!
+            </Header>
+            <Container textAlign="center">
+              <p>{this.props.msg}</p>
+            </Container>
+          </Grid.Column>
+        </Grid>
+      </>
+    );
+  }
+}
diff --git a/smart-hut/src/views/ConfirmForgotPassword.js b/smart-hut/src/views/ConfirmForgotPassword.js
index 1f4d0ec..7459df7 100644
--- a/smart-hut/src/views/ConfirmForgotPassword.js
+++ b/smart-hut/src/views/ConfirmForgotPassword.js
@@ -1,40 +1,9 @@
-import React, { Component } from "react";
-import {
-  Image,
-  Grid,
-  Button,
-  Icon,
-  Header,
-  Container,
-} from "semantic-ui-react";
+import React, { Component } from 'react';
+import Confirm from './Confirm';
 
+const msg = "An E-mail has been sent to your address, confirm your registration by following the enclosed link. If you don't find the E-mail please check also the spam folder.";
 export default class ConfirmForgotPasswrod extends Component {
   render() {
-    return (
-      <React.Fragment>
-        <Button circular style={{ margin: "2em" }} href="/">
-          <Icon name="arrow alternate circle left" />
-          Go Home{" "}
-        </Button>
-        <Grid
-          textAlign="center"
-          style={{ height: "70vh" }}
-          verticalAlign="middle"
-        >
-          <Grid.Column style={{ maxWidth: 450 }}>
-            <Header as="h2" color="blue" textAlign="center">
-              <Image src="img/logo.png" /> Link has been sent!
-            </Header>
-            <Container textAlign="center">
-              <p>
-                An E-mail has been sent to your address, please follow the
-                instructions to create a new password. If you don't find the
-                E-mail please check also the spam folder.
-              </p>
-            </Container>
-          </Grid.Column>
-        </Grid>
-      </React.Fragment>
-    );
+    return <Confirm msg={msg} />;
   }
 }
diff --git a/smart-hut/src/views/ConfirmRegistration.js b/smart-hut/src/views/ConfirmRegistration.js
index 05adedd..8c13b3a 100644
--- a/smart-hut/src/views/ConfirmRegistration.js
+++ b/smart-hut/src/views/ConfirmRegistration.js
@@ -1,40 +1,9 @@
-import React, { Component } from "react";
-import {
-  Image,
-  Grid,
-  Button,
-  Icon,
-  Header,
-  Container,
-} from "semantic-ui-react";
+import React, { Component } from 'react';
+import Confirm from './Confirm';
 
+const msg = "An E-mail has been sent to your address, confirm your registration by following the enclosed link. If you don't find the E-mail please check also the spam folder.";
 export default class ConfirmRegistration extends Component {
   render() {
-    return (
-      <React.Fragment>
-        <Button circular style={{ margin: "2em" }} href="/">
-          <Icon name="arrow alternate circle left" />
-          Go Home{" "}
-        </Button>
-        <Grid
-          textAlign="center"
-          style={{ height: "70vh" }}
-          verticalAlign="middle"
-        >
-          <Grid.Column style={{ maxWidth: 450 }}>
-            <Header as="h2" color="blue" textAlign="center">
-              <Image src="img/logo.png" /> Congratulation!
-            </Header>
-            <Container textAlign="center">
-              <p>
-                An E-mail has been sent to your address, confirm your
-                registration by following the enclosed link. If you don't find
-                the E-mail please check also the spam folder.
-              </p>
-            </Container>
-          </Grid.Column>
-        </Grid>
-      </React.Fragment>
-    );
+    return <Confirm msg={msg} />;
   }
 }
diff --git a/smart-hut/src/views/ConfirmResetPassword.js b/smart-hut/src/views/ConfirmResetPassword.js
index 75c0bdc..798e9af 100644
--- a/smart-hut/src/views/ConfirmResetPassword.js
+++ b/smart-hut/src/views/ConfirmResetPassword.js
@@ -1,36 +1,10 @@
-import React, { Component } from "react";
-import {
-  Image,
-  Grid,
-  Button,
-  Icon,
-  Header,
-  Container,
-} from "semantic-ui-react";
+import React, { Component } from 'react';
+import Confirm from './Confirm';
+
+const msg = 'Your password has been successfully reset.';
 
 export default class ConfirmResetPassword extends Component {
   render() {
-    return (
-      <React.Fragment>
-        <Button circular style={{ margin: "2em" }} href="/">
-          <Icon name="arrow alternate circle left" />
-          Go Home{" "}
-        </Button>
-        <Grid
-          textAlign="center"
-          style={{ height: "70vh" }}
-          verticalAlign="middle"
-        >
-          <Grid.Column style={{ maxWidth: 450 }}>
-            <Header as="h2" color="blue" textAlign="center">
-              <Image src="img/logo.png" /> Congratulation!
-            </Header>
-            <Container textAlign="center">
-              <p>Your password has been successfully reset.</p>
-            </Container>
-          </Grid.Column>
-        </Grid>
-      </React.Fragment>
-    );
+    return <Confirm msg={msg} />;
   }
 }
diff --git a/smart-hut/src/views/Dashboard.js b/smart-hut/src/views/Dashboard.js
index 1d97806..4cb70b9 100644
--- a/smart-hut/src/views/Dashboard.js
+++ b/smart-hut/src/views/Dashboard.js
@@ -1,27 +1,26 @@
-import React, { Component } from "react";
-import DevicePanel from "../components/dashboard/DevicePanel";
-import ScenesPanel from "../components/dashboard/ScenesPanel";
-import AutomationsPanel from "../components/dashboard/AutomationsPanel";
-import Navbar from "./Navbar";
-import ScenesNavbar from "./ScenesNavbar";
-import AutomationsNavbar from "./AutomationsNavbar";
-import MyHeader from "../components/HeaderController";
-import { Grid, Responsive, Button } from "semantic-ui-react";
+import React, { Component } from 'react';
 import {
-  panelStyle,
-  mobilePanelStyle,
-} from "../components/dashboard/devices/styleComponents";
+ Grid, Responsive, Button, Menu,
+} from 'semantic-ui-react';
+import { connect } from 'react-redux';
+import DevicePanel from '../components/dashboard/DevicePanel';
+import ScenesPanel from '../components/dashboard/ScenesPanel';
+import AutomationsPanel from '../components/dashboard/AutomationsPanel';
+import HostsPanel from '../components/dashboard/HostsPanel';
+import Navbar from './Navbar';
+import ScenesNavbar from './ScenesNavbar';
+import HostsNavbar from './HostsNavbar';
+import MyHeader from '../components/HeaderController';
+import { mobilePanelStyle } from '../components/dashboard/devices/styleComponents';
 
-import { RemoteService } from "../remote";
-import { connect } from "react-redux";
-import { appActions } from "../storeActions";
+import { RemoteService } from '../remote';
+import { appActions } from '../storeActions';
 
 class Dashboard extends Component {
   constructor(props) {
     super(props);
     this.state = this.initialState;
-    this.setInitialState();
-    this.activeTab = "Automations"; //TODO Remove this to not put automations first
+    this.activeTab = 'Devices';
     this.selectTab = this.selectTab.bind(this);
   }
 
@@ -50,12 +49,14 @@ class Dashboard extends Component {
 
   renderTab(tab) {
     switch (tab) {
-      case "Devices":
+      case 'Devices':
         return <DevicePanel tab={this.state.activeTab} />;
-      case "Scenes":
+      case 'Scenes':
         return <ScenesPanel tab={this.state.activeTab} />;
-      case "Automations":
+      case 'Automations':
         return <AutomationsPanel />;
+      case 'Hosts':
+        return <HostsPanel />;
       default:
         return <h1>ERROR</h1>;
     }
@@ -63,63 +64,89 @@ class Dashboard extends Component {
 
   renderNavbar(tab) {
     switch (tab) {
-      case "Devices":
+      case 'Devices':
         return <Navbar />;
-      case "Scenes":
+      case 'Scenes':
         return <ScenesNavbar />;
-      case "Automations":
-        return <AutomationsNavbar />;
+      case 'Hosts':
+        return <HostsNavbar />;
       default:
         return <h1>ERROR</h1>;
     }
   }
 
+  get hasNavbar() {
+    return this.state.activeTab !== 'Automations';
+  }
+
   render() {
+    // needed to correctly assign the background image
+    // in case a room has one.
+    let backgroundImageHelper;
+    if (this.activeTab === 'Devices') {
+      backgroundImageHelper = this.props.backgroundImage;
+    } else {
+      backgroundImageHelper = null;
+    }
+    // console.log("helper is",helper)
     return (
-      <div style={{ background: "#1b1c1d" }}>
+      <div style={{ background: '#1b1c1d' }}>
         <Responsive minWidth={768}>
           <Grid>
-            <Grid.Row color="black">
+            <Grid.Row color="black" style={{ paddingBottom: 0 }}>
               <Grid.Column>
                 <MyHeader />
               </Grid.Column>
             </Grid.Row>
-            <Grid.Row color="black">
-              <Grid.Column width={3}></Grid.Column>
-              <Grid.Column textAlign="center" width={13}>
-                <Button
-                  basic
-                  name="Devices"
-                  content="Devices"
-                  active={this.activeTab === "Devices"}
-                  color={this.activeTab === "Devices" ? "yellow" : "grey"}
-                  onClick={this.selectTab}
-                />
-                <Button
-                  basic
-                  name="Scenes"
-                  content="Scenes"
-                  active={this.activeTab === "Scenes"}
-                  color={this.activeTab === "Scenes" ? "yellow" : "grey"}
-                  onClick={this.selectTab}
-                />
-                <Button
-                  basic
-                  name="Automations"
-                  content="Automations"
-                  active={this.activeTab === "Automations"}
-                  color={this.activeTab === "Automations" ? "yellow" : "grey"}
-                  onClick={this.selectTab}
-                />
-              </Grid.Column>
-            </Grid.Row>
-            <Grid.Row color="black">
-              <Grid.Column width={3}>
-                {this.renderNavbar(this.activeTab)}
+            <Grid.Row color="black" style={{ paddingTop: 0 }}>
+              <Grid.Column textAlign="center" width={16}>
+                <Menu fluid widths={4} inverted color="grey">
+                  <Menu.Item
+                    name="Devices"
+                    content="Devices"
+                    active={this.activeTab === 'Devices'}
+                    onClick={this.selectTab}
+                  />
+                  <Menu.Item
+                    name="Scenes"
+                    content="Scenes"
+                    active={this.activeTab === 'Scenes'}
+                    onClick={this.selectTab}
+                  />
+                  <Menu.Item
+                    name="Automations"
+                    content="Automations"
+                    active={this.activeTab === 'Automations'}
+                    onClick={this.selectTab}
+                  />
+                  <Menu.Item
+                    name="Hosts"
+                    content="Hosts and Guests"
+                    active={this.activeTab === 'Hosts'}
+                    onClick={this.selectTab}
+                  />
+                </Menu>
               </Grid.Column>
 
-              <Grid.Column width={13}>
-                <div style={panelStyle}>{this.renderTab(this.activeTab)}</div>
+              {this.hasNavbar && (
+                <Grid.Column width={3}>
+                  {this.renderNavbar(this.activeTab)}
+                </Grid.Column>
+              )}
+              <Grid.Column width={this.hasNavbar ? 13 : 16}>
+                <div
+                  style={{
+                    backgroundImage: `url(${backgroundImageHelper})`,
+                    backgroundColor: '#fafafa',
+                    height: '85vh',
+                    padding: '0rem 3rem',
+                    color: '#000000',
+                    overflow: 'auto',
+                    maxHeight: '75vh',
+                  }}
+                >
+                  {this.renderTab(this.activeTab)}
+                </div>
               </Grid.Column>
             </Grid.Row>
           </Grid>
@@ -137,33 +164,45 @@ class Dashboard extends Component {
                   basic
                   name="Devices"
                   content="Devices"
-                  active={this.activeTab === "Devices"}
-                  color={this.activeTab === "Devices" ? "yellow" : "grey"}
+                  active={this.activeTab === 'Devices'}
+                  color={this.activeTab === 'Devices' ? 'yellow' : 'grey'}
                   onClick={this.selectTab}
                 />
                 <Button
                   basic
                   name="Scenes"
                   content="Scenes"
-                  active={this.activeTab === "Scenes"}
-                  color={this.activeTab === "Scenes" ? "yellow" : "grey"}
+                  active={this.activeTab === 'Scenes'}
+                  color={this.activeTab === 'Scenes' ? 'yellow' : 'grey'}
                   onClick={this.selectTab}
                 />
                 <Button
                   basic
                   name="Automations"
                   content="Automations"
-                  active={this.activeTab === "Automations"}
-                  color={this.activeTab === "Automations" ? "yellow" : "grey"}
+                  active={this.activeTab === 'Automations'}
+                  color={this.activeTab === 'Automations' ? 'yellow' : 'grey'}
+                  onClick={this.selectTab}
+                />
+                <Button
+                  basic
+                  name="Hosts"
+                  content="Hosts"
+                  active={this.activeTab === 'Hosts'}
+                  color={
+                    this.activeTab === 'Hosts and Guests' ? 'yellow' : 'grey'
+                  }
                   onClick={this.selectTab}
                 />
               </Grid.Column>
             </Grid.Row>
-            <Grid.Row color="black">
-              <Grid.Column color="black">
-                {this.renderNavbar(this.activeTab)}
-              </Grid.Column>
-            </Grid.Row>
+            {this.hasNavbar && (
+              <Grid.Row color="black">
+                <Grid.Column color="black">
+                  {this.renderNavbar(this.activeTab)}
+                </Grid.Column>
+              </Grid.Row>
+            )}
             <Grid.Row>
               <Grid.Column>
                 <div style={mobilePanelStyle}>
@@ -180,11 +219,18 @@ class Dashboard extends Component {
 
 const mapStateToProps = (state, _) => ({
   activeTab: state.active.activeTab,
+  get currentRoom() {
+    return state.active.activeRoom;
+  },
+  get backgroundImage() {
+    if (state.active.activeRoom === -1) {
+      return null;
+    }
+      return state.rooms[state.active.activeRoom].image;
+  },
 });
 
-const setActiveTab = (activeTab) => {
-  return (dispatch) => dispatch(appActions.setActiveTab(activeTab));
-};
+const setActiveTab = (activeTab) => (dispatch) => dispatch(appActions.setActiveTab(activeTab));
 
 const DashboardContainer = connect(mapStateToProps, {
   ...RemoteService,
diff --git a/smart-hut/src/views/DashboardTest.js b/smart-hut/src/views/DashboardTest.js
index a56453f..6e07118 100644
--- a/smart-hut/src/views/DashboardTest.js
+++ b/smart-hut/src/views/DashboardTest.js
@@ -1,5 +1,5 @@
-import React, { Component } from "react";
-import { Button } from "semantic-ui-react";
+import React, { Component } from 'react';
+import { Button } from 'semantic-ui-react';
 
 export default class Dashboard extends Component {
   handleLogOut = (e) => {
@@ -9,8 +9,9 @@ export default class Dashboard extends Component {
 
   render() {
     return (
-      <Button circular style={{ margin: "2em" }} onClick={this.handleLogOut}>
-        Go Home{" "}
+      <Button circular style={{ margin: '2em' }} onClick={this.handleLogOut}>
+        Go Home
+        {' '}
       </Button>
     );
   }
diff --git a/smart-hut/src/views/Forgot-pass-reset.js b/smart-hut/src/views/Forgot-pass-reset.js
deleted file mode 100644
index 24ed9e6..0000000
--- a/smart-hut/src/views/Forgot-pass-reset.js
+++ /dev/null
@@ -1,114 +0,0 @@
-import React, { Component } from "react";
-import {
-  Button,
-  Form,
-  Grid,
-  Header,
-  Image,
-  Icon,
-  Message,
-} from "semantic-ui-react";
-import { Redirect } from "react-router-dom";
-import { Forms } from "../remote";
-
-export default class ChangePass extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      password: "",
-      error: {
-        state: false,
-        message: "",
-      },
-      success: false,
-    };
-    this.handleChangePassword = this.handleChangePassword.bind(this);
-  }
-
-  onChangeHandler = (event) => {
-    let nam = event.target.name;
-    let val = event.target.value;
-    this.setState({ [nam]: val });
-  };
-
-  handleChangePassword = (e) => {
-    if (this.state.confirmPassword !== this.state.password) {
-      this.setState({
-        error: {
-          state: true,
-          message: "Passwords do not match.",
-        },
-      });
-    }
-
-    Forms.submitResetPassword(this.props.query.token, this.state.password)
-      .then(() => this.setState({ success: true }))
-      .catch((err) =>
-        this.setState({
-          error: { state: true, message: err.messages.join(" - ") },
-        })
-      );
-  };
-
-  render() {
-    if (this.state.success) {
-      return <Redirect to="/login" />;
-    }
-    return (
-      <React.Fragment>
-        <Button circular style={{ margin: "2em" }} href="/">
-          <Icon name="arrow alternate circle left" />
-          Go Home{" "}
-        </Button>
-        <Grid
-          textAlign="center"
-          style={{ height: "70vh" }}
-          verticalAlign="middle"
-        >
-          <Grid.Column style={{ maxWidth: 450 }}>
-            <Header as="h2" color="blue" textAlign="center">
-              <Image src="img/logo.png" /> Reset Password
-            </Header>
-            <Form
-              size="large"
-              style={{ marginTop: "2em" }}
-              error={this.state.error.state}
-            >
-              <Message
-                error
-                header="Change Password Error"
-                content={this.state.error.message}
-              />
-              <Form.Input
-                icon="address card outline"
-                iconPosition="left"
-                placeholder="Reset your password"
-                name="password"
-                type="password"
-                onChange={this.onChangeHandler}
-                required
-              />
-              <Form.Input
-                icon="address card outline"
-                iconPosition="left"
-                placeholder="Confirm Password"
-                name="confirmPassword"
-                type="password"
-                onChange={this.onChangeHandler}
-                required
-              />
-              <Button
-                color="blue"
-                fluid
-                size="large"
-                onClick={this.handleChangePassword}
-              >
-                Confirm password
-              </Button>
-            </Form>
-          </Grid.Column>
-        </Grid>
-      </React.Fragment>
-    );
-  }
-}
diff --git a/smart-hut/src/views/Forgot-password.js b/smart-hut/src/views/Forgot-password.js
index 6ebc2a5..47797c4 100644
--- a/smart-hut/src/views/Forgot-password.js
+++ b/smart-hut/src/views/Forgot-password.js
@@ -1,4 +1,4 @@
-import React, { Component } from "react";
+import React, { Component } from 'react';
 import {
   Button,
   Form,
@@ -7,26 +7,28 @@ import {
   Image,
   Icon,
   Message,
-} from "semantic-ui-react";
-import { Redirect } from "react-router-dom";
-import { Forms } from "../remote";
+} from 'semantic-ui-react';
+import { Redirect } from 'react-router-dom';
+import { Forms } from '../remote';
 
 export default class ForgotPass extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      user: "",
+      user: '',
       error: {
         state: false,
         message: [],
       },
       success: false,
     };
+
+    this.handleChangePassword = this.handleChangePassword.bind(this);
   }
 
   onChangeHandler = (event) => {
-    let nam = event.target.name;
-    let val = event.target.value;
+    const nam = event.target.name;
+    const val = event.target.value;
     this.setState({ [nam]: val });
   };
 
@@ -35,33 +37,52 @@ export default class ForgotPass extends Component {
 
     Forms.submitInitResetPassword(this.state.user)
       .then(() => this.setState({ success: true }))
-      .catch((err) =>
-        this.setState({ error: { state: true, message: err.messages } })
-      );
+      .catch((err) => this.setState({ error: { state: true, message: err.messages } }));
+  };
+
+  handleChangePassword = (e) => {
+    if (this.state.confirmPassword !== this.state.password) {
+      this.setState({
+        error: {
+          state: true,
+          message: 'Passwords do not match.',
+        },
+      });
+    }
+
+    Forms.submitResetPassword(this.props.query.token, this.state.password)
+      .then(() => this.setState({ success: true }))
+      .catch((err) => this.setState({
+          error: { state: true, message: err.messages.join(' - ') },
+        }));
   };
 
   render() {
+    console.log(this.props);
     if (this.state.success) {
       return <Redirect to="sent-email" />;
     }
     return (
-      <React.Fragment>
-        <Button circular style={{ margin: "2em" }} href="/">
+      <>
+        <Button circular style={{ margin: '2em' }} href="/">
           <Icon name="arrow alternate circle left" />
-          Go Home{" "}
+          Go Home
+          {' '}
         </Button>
         <Grid
           textAlign="center"
-          style={{ height: "70vh" }}
+          style={{ height: '70vh' }}
           verticalAlign="middle"
         >
           <Grid.Column style={{ maxWidth: 450 }}>
             <Header as="h2" color="blue" textAlign="center">
-              <Image src="img/logo.png" /> Reset Password
+              <Image src="img/logo.png" />
+              {' '}
+Reset Password
             </Header>
             <Form
               size="large"
-              style={{ marginTop: "2em" }}
+              style={{ marginTop: '2em' }}
               error={this.state.error.state}
             >
               <Message error>
@@ -74,27 +95,60 @@ export default class ForgotPass extends Component {
                   </span>
                 ))}
               </Message>
-              <Form.Input
-                icon="address card outline"
-                iconPosition="left"
-                placeholder="Enter your E-mail"
-                name="user"
-                type="text"
-                onChange={this.onChangeHandler}
-                required
-              />
-              <Button
-                color="blue"
-                fluid
-                size="large"
-                onClick={this.handleSendEmail}
-              >
-                Send E-mail
-              </Button>
+              {this.props.type === 'FPassword1' ? (
+                <>
+                  <Form.Input
+                    icon="address card outline"
+                    iconPosition="left"
+                    placeholder="Enter your E-mail"
+                    name="user"
+                    type="text"
+                    onChange={this.onChangeHandler}
+                    required
+                  />
+                  <Button
+                    color="blue"
+                    fluid
+                    size="large"
+                    onClick={this.handleSendEmail}
+                  >
+                    Send E-mail
+                  </Button>
+                </>
+              ) : (
+                <>
+                  <Form.Input
+                    icon="address card outline"
+                    iconPosition="left"
+                    placeholder="Reset your password"
+                    name="password"
+                    type="password"
+                    onChange={this.onChangeHandler}
+                    required
+                  />
+                  <Form.Input
+                    icon="address card outline"
+                    iconPosition="left"
+                    placeholder="Confirm Password"
+                    name="confirmPassword"
+                    type="password"
+                    onChange={this.onChangeHandler}
+                    required
+                  />
+                  <Button
+                    color="blue"
+                    fluid
+                    size="large"
+                    onClick={this.handleChangePassword}
+                  >
+                    Confirm password
+                  </Button>
+                </>
+              )}
             </Form>
           </Grid.Column>
         </Grid>
-      </React.Fragment>
+      </>
     );
   }
 }
diff --git a/smart-hut/src/views/ForgotPassword.js b/smart-hut/src/views/ForgotPassword.js
deleted file mode 100644
index b6ade3f..0000000
--- a/smart-hut/src/views/ForgotPassword.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import React, { Component } from "react";
-import { render } from "react-dom";
-import HomeNavbar from "./../components/HomeNavbar";
-import {
-  Container,
-  Icon,
-  Image,
-  Menu,
-  Sidebar,
-  Responsive,
-  Header,
-  Divider,
-  Message,
-  Grid,
-} from "semantic-ui-react";
-
-class Paragraph extends Component {
-  state = { visible: true };
-
-  handleDismiss = () => {
-    this.setState({ visible: false });
-
-    setTimeout(() => {
-      this.setState({ visible: true });
-    }, 2000);
-  };
-
-  render() {
-    if (this.state.visible) {
-      return (
-        <Message
-          onDismiss={this.handleDismiss}
-          header="Link has been sent!"
-          content="An e-mail has been sent your address, please follow the
-            instruction to create a new password"
-        />
-      );
-    }
-
-    return (
-      <p>
-        <br />
-        <i>The message will return in 2s</i>
-        <br />
-        <br />
-      </p>
-    );
-  }
-}
-
-const MessageReg = () => (
-  <Grid>
-    <HomeNavbar />
-    <Divider />
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}>
-      <Grid.Column width={6}></Grid.Column>
-      <Grid.Column width={10}>
-        <Image src="title5.png" />
-      </Grid.Column>
-      <Grid.Column width={3}></Grid.Column>
-    </Grid.Row>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Column width={3}></Grid.Column>
-    <Grid.Column width={4}>
-      <Image src="./img/logo.png" />
-    </Grid.Column>
-    <Grid.Column width={6}>
-      <Paragraph />
-    </Grid.Column>
-    <Grid.Column width={4}></Grid.Column>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}>
-      <Grid.Column width={3}></Grid.Column>
-      <Grid.Column width={10}>
-        <Divider />
-      </Grid.Column>
-      <Grid.Column width={3}></Grid.Column>
-    </Grid.Row>
-  </Grid>
-);
-
-export default class ForgotPasswrod extends React.Component {
-  render() {
-    return <MessageReg />;
-  }
-}
diff --git a/smart-hut/src/views/FourOhFour.js b/smart-hut/src/views/FourOhFour.js
index 14ae7af..f6f52e8 100644
--- a/smart-hut/src/views/FourOhFour.js
+++ b/smart-hut/src/views/FourOhFour.js
@@ -1,35 +1,37 @@
-import React, { Component } from "react";
-import { Grid, Button, Segment, Responsive, Image } from "semantic-ui-react";
-import { Link } from "react-router-dom";
-import MyHeader from "../components/HeaderController";
+import React, { Component } from 'react';
+import {
+ Grid, Button, Segment, Responsive, Image,
+} from 'semantic-ui-react';
+import { Link } from 'react-router-dom';
+import MyHeader from '../components/HeaderController';
 
 export default class FourOhFour extends Component {
   constructor(props) {
     super(props);
     const meme = [
-      "1.jpeg",
-      "2.jpeg",
-      "3.png",
-      "4.jpeg",
-      "5.jpeg",
-      "6.jpg",
-      "7.jpg",
-      "8.jpg",
-      "9.jpeg",
-      "10.jpg",
-      "11.jpeg",
-      "12.gif",
-      "13.gif",
-      "14.gif",
+      '1.jpeg',
+      '2.jpeg',
+      '3.png',
+      '4.jpeg',
+      '5.jpeg',
+      '6.jpg',
+      '7.jpg',
+      '8.jpg',
+      '9.jpeg',
+      '10.jpg',
+      '11.jpeg',
+      '12.gif',
+      '13.gif',
+      '14.gif',
     ];
-    var arrayNum = Math.floor(Math.random() * 13) + 1;
-    var path = "img/room_404_meme/" + meme[arrayNum];
+    const arrayNum = Math.floor(Math.random() * 13) + 1;
+    const path = `img/room_404_meme/${meme[arrayNum]}`;
     this.state = { meme: path };
   }
 
   render() {
     return (
-      <div style={{ height: "110vh", background: "#1b1c1d" }}>
+      <div style={{ height: '110vh', background: '#1b1c1d' }}>
         <Responsive minWidth={768}>
           <Grid>
             <Grid.Row color="black">
@@ -59,7 +61,7 @@ export default class FourOhFour extends Component {
                           our main room! ...or refresh this page some times...
                         </p>
                         <Button fluid inverted color="white">
-                          <Link style={{ color: "black" }} to="/">
+                          <Link style={{ color: 'black' }} to="/">
                             Let's go back to our main room!
                           </Link>
                         </Button>
@@ -103,7 +105,7 @@ export default class FourOhFour extends Component {
                           our main room! ...or refresh this page some times...
                         </p>
                         <Button fluid inverted color="white">
-                          <Link style={{ color: "black" }} to="/">
+                          <Link style={{ color: 'black' }} to="/">
                             Let's go back to our main room!
                           </Link>
                         </Button>
diff --git a/smart-hut/src/views/Home.js b/smart-hut/src/views/Home.js
index b5e904f..a846d9b 100644
--- a/smart-hut/src/views/Home.js
+++ b/smart-hut/src/views/Home.js
@@ -1,6 +1,5 @@
-import PropTypes from "prop-types";
-import React, { Component } from "react";
-import HomeNavbar from "./../components/HomeNavbar";
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 import {
   Button,
   Container,
@@ -14,13 +13,14 @@ import {
   Segment,
   Sidebar,
   Visibility,
-} from "semantic-ui-react";
+} from 'semantic-ui-react';
+import HomeNavbar from '../components/HomeNavbar';
 
 // Heads up!
 // We using React Static to prerender our docs with server side rendering, this is a quite simple solution.
 // For more advanced usage please check Responsive docs under the "Usage" section.
 const getWidth = () => {
-  const isSSR = typeof window === "undefined";
+  const isSSR = typeof window === 'undefined';
   return isSSR ? Responsive.onlyTablet.minWidth : window.innerWidth;
 };
 
@@ -35,10 +35,10 @@ const HomepageHeading = ({ mobile }) => (
       content="SmartHut"
       inverted
       style={{
-        fontSize: mobile ? "2em" : "4em",
-        fontWeight: "normal",
+        fontSize: mobile ? '2em' : '4em',
+        fontWeight: 'normal',
         marginBottom: 0,
-        marginTop: mobile ? "1.5em" : "3em",
+        marginTop: mobile ? '1.5em' : '3em',
       }}
     />
     <Header
@@ -46,9 +46,9 @@ const HomepageHeading = ({ mobile }) => (
       content="Keep your Home fully Connected"
       inverted
       style={{
-        fontSize: mobile ? "1.5em" : "1.7em",
-        fontWeight: "normal",
-        marginTop: mobile ? "0.5em" : "1.5em",
+        fontSize: mobile ? '1.5em' : '1.7em',
+        fontWeight: 'normal',
+        marginTop: mobile ? '0.5em' : '1.5em',
       }}
     />
     <Button size="huge" color="orange" href="/signup">
@@ -64,7 +64,9 @@ HomepageHeading.propTypes = {
 
 class DesktopContainer extends Component {
   state = {};
+
   hideFixedMenu = () => this.setState({ fixed: false });
+
   showFixedMenu = () => this.setState({ fixed: true });
 
   render() {
@@ -82,9 +84,9 @@ class DesktopContainer extends Component {
             textAlign="center"
             style={{
               minHeight: 700,
-              padding: "1em 0em",
-              background: ` linear-gradient(to bottom, rgba(0, 46, 200, 0.51), rgba(0, 0, 0, 0.51)), url("img/header.jpg")`,
-              backgroundSize: "cover",
+              padding: '1em 0em',
+              background: ' linear-gradient(to bottom, rgba(0, 46, 200, 0.51), rgba(0, 0, 0, 0.51)), url("img/header.jpg")',
+              backgroundSize: 'cover',
             }}
             vertical
           >
@@ -139,7 +141,7 @@ class MobileContainer extends Component {
           <Segment
             inverted
             textAlign="center"
-            style={{ minHeight: 350, padding: "1em 0em" }}
+            style={{ minHeight: 350, padding: '1em 0em' }}
             vertical
           >
             <Container>
@@ -151,7 +153,7 @@ class MobileContainer extends Component {
                   <Button as="a" inverted>
                     Log in
                   </Button>
-                  <Button as="a" inverted style={{ marginLeft: "0.5em" }}>
+                  <Button as="a" inverted style={{ marginLeft: '0.5em' }}>
                     Sign Up
                   </Button>
                 </Menu.Item>
@@ -184,20 +186,20 @@ ResponsiveContainer.propTypes = {
 
 const Home = () => (
   <ResponsiveContainer>
-    <Segment style={{ padding: "8em 0em" }} vertical>
+    <Segment style={{ padding: '8em 0em' }} vertical>
       <Grid container stackable verticalAlign="middle">
         <Grid.Row>
           <Grid.Column width={8}>
-            <Header as="h3" style={{ fontSize: "2em" }}>
+            <Header as="h3" style={{ fontSize: '2em' }}>
               We help you keep your home connected
             </Header>
-            <p style={{ fontSize: "1.33em" }}>
+            <p style={{ fontSize: '1.33em' }}>
               In a few steps your home will be fully connected with SmartHut.
             </p>
-            <Header as="h3" style={{ fontSize: "2em" }}>
+            <Header as="h3" style={{ fontSize: '2em' }}>
               Choose between a wide range of devices
             </Header>
-            <p style={{ fontSize: "1.33em" }}>
+            <p style={{ fontSize: '1.33em' }}>
               SmartHut is a leading worldwide company in technology innovation.
               Explore our website to find the best devices for each room of your
               home!
@@ -210,12 +212,12 @@ const Home = () => (
       </Grid>
     </Segment>
 
-    <Segment style={{ padding: "8em 0em" }} vertical>
+    <Segment style={{ padding: '8em 0em' }} vertical>
       <Container text>
-        <Header as="h3" style={{ fontSize: "2em" }}>
+        <Header as="h3" style={{ fontSize: '2em' }}>
           Have you ever dreamt about a smart home?
         </Header>
-        <p style={{ fontSize: "1.33em" }}>
+        <p style={{ fontSize: '1.33em' }}>
           Let us carrying you into the future. With SmartHut, being at home will
           be a refreshing experience. With just a few clicks, you will be able
           the set the illumination of your entire place. Follow the intelligent
@@ -224,7 +226,7 @@ const Home = () => (
       </Container>
     </Segment>
 
-    <Segment inverted vertical style={{ padding: "5em 0em" }}>
+    <Segment inverted vertical style={{ padding: '5em 0em' }}>
       <Container>
         <Grid divided inverted stackable>
           <Grid.Row>
@@ -247,7 +249,7 @@ const Home = () => (
                   </a>
                 </List.Item>
                 <List.Item>
-                  <a href="https://theshell.ch" target="blank">
+                  <a href="https://www.theshell.ch" target="blank">
                     The Shell
                   </a>
                 </List.Item>
diff --git a/smart-hut/src/views/HostsNavbar.js b/smart-hut/src/views/HostsNavbar.js
new file mode 100644
index 0000000..a5d5e52
--- /dev/null
+++ b/smart-hut/src/views/HostsNavbar.js
@@ -0,0 +1,117 @@
+import React, { Component } from 'react';
+import {
+ Menu, Grid, Responsive, Dropdown,
+} from 'semantic-ui-react';
+import { connect } from 'react-redux';
+import HostModal from '../components/HostModal';
+import { RemoteService } from '../remote';
+import { appActions } from '../storeActions';
+
+class HostsNavbar extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      editMode: false,
+    };
+
+    this.getHosts();
+    this.selectHosts = this.selectHosts.bind(this);
+  }
+
+  getHosts() {
+    this.props.fetchHosts().catch(console.error);
+  }
+
+  selectHosts(_, { id }) {
+    this.props.setActiveHost(id || -1);
+  }
+
+  get activeItem() {
+    return this.props.activeHost;
+  }
+
+  get activeItemHostsName() {
+    if (this.props.activeItem === -1) return 'Home';
+    return this.props.hosts[this.props.activeHost].name;
+  }
+
+  render() {
+    return (
+      <div>
+        <Responsive minWidth={768}>
+          <Grid style={{ margin: '1em -1em 0 1em' }}>
+            <Grid.Row>
+              <Menu inverted fluid vertical>
+                <Menu.Item
+                  key={-1}
+                  id={null}
+                  name="hosts"
+                  active={this.activeItem === -1}
+                  onClick={this.selectHosts}
+                >
+                  <strong>Hosts</strong>
+                </Menu.Item>
+                {Object.values(this.props.hosts).map((e, i) => (
+                  <Menu.Item
+                    id={e.id}
+                    key={i}
+                    name={e.name}
+                    active={this.activeItem === e.id}
+                    onClick={this.selectHosts}
+                  >
+                    {e.name}
+                  </Menu.Item>
+                  ))}
+                <Menu.Item name="newM">
+                  <HostModal />
+                </Menu.Item>
+              </Menu>
+            </Grid.Row>
+          </Grid>
+        </Responsive>
+
+        <Responsive maxWidth={768}>
+          <Menu>
+            <Dropdown item fluid text={this.activeItemHostName}>
+              <Dropdown.Menu>
+                <Dropdown.Item
+                  key={-1}
+                  id={null}
+                  name="scene"
+                  active={this.activeItem === -1}
+                  onClick={this.selectHosts}
+                >
+                  <strong>Hosts</strong>
+                </Dropdown.Item>
+
+                {Object.values(this.props.hosts).map((e, i) => (
+                  <Menu.Item
+                    id={e.id}
+                    key={i}
+                    name={e.name}
+                    active={this.activeItem === e.id}
+                    onClick={this.selectHosts}
+                  >
+                    {e.name}
+                  </Menu.Item>
+                  ))}
+              </Dropdown.Menu>
+            </Dropdown>
+          </Menu>
+        </Responsive>
+      </div>
+    );
+  }
+}
+
+const setActiveHost = (activeHost) => (dispatch) => dispatch(appActions.setActiveHost(activeHost));
+
+const mapStateToProps = (state, _) => ({
+  hosts: state.hosts,
+  activeHost: state.active.activeHost,
+});
+const HostsNavbarContainer = connect(mapStateToProps, {
+  ...RemoteService,
+  setActiveHost,
+})(HostsNavbar);
+export default HostsNavbarContainer;
diff --git a/smart-hut/src/views/Instruction.js b/smart-hut/src/views/Instruction.js
index 5dd4923..2da364f 100644
--- a/smart-hut/src/views/Instruction.js
+++ b/smart-hut/src/views/Instruction.js
@@ -1,6 +1,8 @@
-import React, { Component } from "react";
-import HomeNavbar from "./../components/HomeNavbar";
-import { Container, Header, Divider, Grid } from "semantic-ui-react";
+import React, { Component } from 'react';
+import {
+ Container, Header, Divider, Grid,
+} from 'semantic-ui-react';
+import HomeNavbar from '../components/HomeNavbar';
 
 const ContainerExampleAlignment = () => (
   <div>
diff --git a/smart-hut/src/views/Login.js b/smart-hut/src/views/Login.js
index 3544e7a..a68d499 100644
--- a/smart-hut/src/views/Login.js
+++ b/smart-hut/src/views/Login.js
@@ -1,4 +1,4 @@
-import React, { Component } from "react";
+import React, { Component } from 'react';
 import {
   Button,
   Form,
@@ -8,19 +8,19 @@ import {
   Message,
   Icon,
   Input,
-} from "semantic-ui-react";
-import { RemoteService } from "../remote";
-import { withRouter } from "react-router-dom";
-import { connect } from "react-redux";
+} from 'semantic-ui-react';
+import { withRouter } from 'react-router-dom';
+import { connect } from 'react-redux';
+import { RemoteService } from '../remote';
 
 class Login extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      user: "",
-      password: "",
+      user: '',
+      password: '',
       fireRedirect: false,
-      error: { state: false, message: "" },
+      error: { state: false, message: '' },
     };
   }
 
@@ -29,43 +29,43 @@ class Login extends Component {
 
     this.props
       .login(this.state.user, this.state.password)
-      .then(() => this.props.history.push("/dashboard"))
+      .then(() => this.props.history.push('/dashboard'))
       .catch((err) => {
-        console.log("CIAO", err);
         this.setState({
-          error: { state: true, message: err.messages.join(" - ") },
+          error: { state: true, message: err.messages.join(' - ') },
         });
       });
   };
 
   onChangeHandler = (event) => {
-    let nam = event.target.name;
-    let val = event.target.value;
+    const nam = event.target.name;
+    const val = event.target.value;
     this.setState({ [nam]: val });
   };
 
-  toggle = () =>
-    this.setState((prevState) => ({ rememberme: !prevState.rememberme }));
+  toggle = () => this.setState((prevState) => ({ rememberme: !prevState.rememberme }));
 
   render() {
     return (
-      <React.Fragment>
-        <Button circular style={{ margin: "2em" }} href="/">
+      <>
+        <Button circular style={{ margin: '2em' }} href="/">
           <Icon name="arrow alternate circle left" />
           Go Home
         </Button>
         <Grid
           textAlign="center"
-          style={{ height: "70vh" }}
+          style={{ height: '70vh' }}
           verticalAlign="middle"
         >
           <Grid.Column style={{ maxWidth: 450 }}>
             <Header as="h2" color="blue" textAlign="center">
-              <Image src="img/logo.png" /> Log-in to SmartHut
+              <Image src="img/logo.png" />
+              {' '}
+Log-in to SmartHut
             </Header>
             <Form
               size="large"
-              style={{ marginTop: "2em" }}
+              style={{ marginTop: '2em' }}
               error={this.state.error.state}
             >
               <Message
@@ -105,12 +105,14 @@ class Login extends Component {
                 <a href="/forgot-password">Forgot Password?</a>
               </p>
               <p>
-                New to us? <a href="/signup"> Sign Up</a>
+                New to us?
+                {' '}
+                <a href="/signup"> Sign Up</a>
               </p>
             </Message>
           </Grid.Column>
         </Grid>
-      </React.Fragment>
+      </>
     );
   }
 }
@@ -118,6 +120,6 @@ class Login extends Component {
 const mapStateToProps = (state, _) => ({ loggedIn: state.login.loggedIn });
 const LoginContainer = connect(
   mapStateToProps,
-  RemoteService
+  RemoteService,
 )(withRouter(Login));
 export default LoginContainer;
diff --git a/smart-hut/src/views/Navbar.js b/smart-hut/src/views/Navbar.js
index d7462a5..6927b91 100644
--- a/smart-hut/src/views/Navbar.js
+++ b/smart-hut/src/views/Navbar.js
@@ -1,4 +1,4 @@
-import React, { Component } from "react";
+import React, { Component } from 'react';
 import {
   Menu,
   Button,
@@ -6,12 +6,12 @@ import {
   Icon,
   Responsive,
   Dropdown,
-} from "semantic-ui-react";
-import { editButtonStyle } from "../components/dashboard/devices/styleComponents";
-import RoomModal from "../components/RoomModal";
-import { RemoteService } from "../remote";
-import { connect } from "react-redux";
-import { appActions } from "../storeActions";
+} from 'semantic-ui-react';
+import { connect } from 'react-redux';
+import { editButtonStyle } from '../components/dashboard/devices/styleComponents';
+import RoomModal from '../components/RoomModal';
+import { RemoteService } from '../remote';
+import { appActions } from '../storeActions';
 
 class Navbar extends Component {
   constructor(props) {
@@ -40,7 +40,7 @@ class Navbar extends Component {
   }
 
   get activeItemName() {
-    if (this.props.activeRoom === -1) return "Home";
+    if (this.props.activeRoom === -1) return 'Home';
     return this.props.rooms[this.props.activeRoom].name;
   }
 
@@ -60,9 +60,9 @@ class Navbar extends Component {
 
   render() {
     return (
-      <div style={{ background: "#1b1c1d!important", padding: "0 20px" }}>
+      <div>
         <Responsive minWidth={768}>
-          <Grid>
+          <Grid style={{ margin: '1em -1em 0 1em' }}>
             <Grid.Row color="black">
               <button style={editButtonStyle} onClick={this.toggleEditMode}>
                 Edit
@@ -82,36 +82,36 @@ class Navbar extends Component {
                       <Grid.Column>
                         <Icon name="home" size="small" />
                       </Grid.Column>
-                      <Grid.Column width={8}>House View</Grid.Column>
+                      <Grid.Column width={8}>
+                        <strong>Home view</strong>
+                      </Grid.Column>
                     </Grid.Row>
                   </Grid>
                 </Menu.Item>
 
-                {Object.values(this.props.rooms).map((e, i) => {
-                  return (
-                    <Menu.Item
-                      id={e.id}
-                      key={i}
-                      name={e.name}
-                      active={this.activeItem === e.id}
-                      onClick={this.selectRoom}
-                    >
-                      <Grid>
-                        <Grid.Row>
-                          <Grid.Column>
-                            <Icon name={e.icon} size="small" />
-                          </Grid.Column>
-                          <Grid.Column width={8}>{e.name}</Grid.Column>
-                          <Grid.Column floated="right">
-                            {this.state.editMode ? (
-                              <RoomModal id={e.id} />
+                {Object.values(this.props.rooms).map((e, i) => (
+                  <Menu.Item
+                    id={e.id}
+                    key={i}
+                    name={e.name}
+                    active={this.activeItem === e.id}
+                    onClick={this.selectRoom}
+                  >
+                    <Grid>
+                      <Grid.Row>
+                        <Grid.Column>
+                          <Icon name={e.icon} size="small" />
+                        </Grid.Column>
+                        <Grid.Column width={11}>{e.name}</Grid.Column>
+                        <Grid.Column floated="right">
+                          {this.state.editMode ? (
+                            <RoomModal id={e.id} />
                             ) : null}
-                          </Grid.Column>
-                        </Grid.Row>
-                      </Grid>
-                    </Menu.Item>
-                  );
-                })}
+                        </Grid.Column>
+                      </Grid.Row>
+                    </Grid>
+                  </Menu.Item>
+                  ))}
 
                 <Menu.Item name="newM">
                   <Grid>
@@ -146,31 +146,29 @@ class Navbar extends Component {
                   </Grid>
                 </Dropdown.Item>
 
-                {Object.values(this.props.rooms).map((e, i) => {
-                  return (
-                    <Dropdown.Item
+                {Object.values(this.props.rooms).map((e, i) => (
+                  <Dropdown.Item
+                    id={e.id}
+                    key={i}
+                    name={e.name}
+                    active={this.activeItem === e.id}
+                    onClick={this.selectRoom}
+                  >
+                    <Grid>
+                      <Grid.Row>
+                        <Grid.Column width={1}>
+                          <Icon name={e.icon} size="small" />
+                        </Grid.Column>
+                        <Grid.Column>{e.name}</Grid.Column>
+                      </Grid.Row>
+                    </Grid>
+                    <RoomModal
+                      ref={this.props.roomModalRefs[e.id]}
+                      nicolaStop
                       id={e.id}
-                      key={i}
-                      name={e.name}
-                      active={this.activeItem === e.id}
-                      onClick={this.selectRoom}
-                    >
-                      <Grid>
-                        <Grid.Row>
-                          <Grid.Column width={1}>
-                            <Icon name={e.icon} size="small" />
-                          </Grid.Column>
-                          <Grid.Column>{e.name}</Grid.Column>
-                        </Grid.Row>
-                      </Grid>
-                      <RoomModal
-                        ref={this.props.roomModalRefs[e.id]}
-                        nicolaStop={true}
-                        id={e.id}
-                      />
-                    </Dropdown.Item>
-                  );
-                })}
+                    />
+                  </Dropdown.Item>
+                  ))}
               </Dropdown.Menu>
             </Dropdown>
           </Menu>
@@ -200,16 +198,14 @@ class Navbar extends Component {
   }
 }
 
-const setActiveRoom = (activeRoom) => {
-  return (dispatch) => dispatch(appActions.setActiveRoom(activeRoom));
-};
+const setActiveRoom = (activeRoom) => (dispatch) => dispatch(appActions.setActiveRoom(activeRoom));
 
 const mapStateToProps = (state, _) => ({
   rooms: state.rooms,
   activeRoom: state.active.activeRoom,
   roomModalRefs: Object.keys(state.rooms).reduce(
     (acc, key) => ({ ...acc, [key]: React.createRef() }),
-    {}
+    {},
   ),
 });
 const NavbarContainer = connect(mapStateToProps, {
diff --git a/smart-hut/src/views/ScenesNavbar.js b/smart-hut/src/views/ScenesNavbar.js
index cb35572..0b0f82a 100644
--- a/smart-hut/src/views/ScenesNavbar.js
+++ b/smart-hut/src/views/ScenesNavbar.js
@@ -1,4 +1,4 @@
-import React, { Component } from "react";
+import React, { Component } from 'react';
 import {
   Menu,
   Button,
@@ -6,12 +6,12 @@ import {
   Grid,
   Responsive,
   Dropdown,
-} from "semantic-ui-react";
-import { editButtonStyle } from "../components/dashboard/devices/styleComponents";
-import SceneModal from "../components/SceneModal";
-import { RemoteService } from "../remote";
-import { connect } from "react-redux";
-import { appActions } from "../storeActions";
+} from 'semantic-ui-react';
+import { connect } from 'react-redux';
+import { editButtonStyle } from '../components/dashboard/devices/styleComponents';
+import SceneModal from '../components/SceneModal';
+import { RemoteService } from '../remote';
+import { appActions } from '../storeActions';
 
 class ScenesNavbar extends Component {
   constructor(props) {
@@ -35,7 +35,7 @@ class ScenesNavbar extends Component {
   }
 
   get activeItemSceneName() {
-    if (this.props.activeScene === -1) return "Scene";
+    if (this.props.activeScene === -1) return 'Scene';
     return this.props.scenes[this.props.activeScene].name;
   }
 
@@ -44,7 +44,7 @@ class ScenesNavbar extends Component {
   }
 
   openCurrentModalMobile() {
-    //console.log(this.activeItemScene, this.props.sceneModalRefs);
+    // console.log(this.activeItemScene, this.props.sceneModalRefs);
     const currentModal = this.props.sceneModalRefs[this.activeItemScene]
       .current;
     currentModal.openModal();
@@ -63,15 +63,15 @@ class ScenesNavbar extends Component {
     if (sceneId) {
       this.props
         .fetchStates(sceneId)
-        .catch((err) => console.error(`error fetching states:`, err));
+        .catch((err) => console.error('error fetching states:', err));
     }
   }
 
   render() {
     return (
-      <div style={{ background: "#1b1c1d!important", padding: "0 20px" }}>
+      <div>
         <Responsive minWidth={768}>
-          <Grid>
+          <Grid style={{ margin: '1em -1em 0 1em' }}>
             <Grid.Row color="black">
               <button style={editButtonStyle} onClick={this.toggleEditMode}>
                 Edit
@@ -86,31 +86,32 @@ class ScenesNavbar extends Component {
                   active={this.activeItemScene === -1}
                   onClick={this.selectScene}
                 >
-                  SCENES
+                  <strong>Scenes</strong>
                 </Menu.Item>
 
-                {Object.values(this.props.scenes).map((e, i) => {
-                  return (
-                    <Menu.Item
-                      id={e.id}
-                      key={i}
-                      name={e.name}
-                      active={this.activeItemScene === e.id}
-                      onClick={this.selectScene}
-                    >
-                      <Grid>
-                        <Grid.Row>
-                          <Grid.Column width={12}>{e.name}</Grid.Column>
-                          <Grid.Column floated="right">
-                            {this.state.editMode ? (
-                              <SceneModal id={e.id} />
+                {Object.values(this.props.scenes).map((e, i) => (
+                  <Menu.Item
+                    id={e.id}
+                    key={i}
+                    name={e.name}
+                    active={this.activeItemScene === e.id}
+                    onClick={this.selectScene}
+                  >
+                    <Grid>
+                      <Grid.Row>
+                        <Grid.Column>
+                          <Icon name={e.icon} size="small" />
+                        </Grid.Column>
+                        <Grid.Column width={11}>{e.name}</Grid.Column>
+                        <Grid.Column floated="right">
+                          {this.state.editMode ? (
+                            <SceneModal id={e.id} />
                             ) : null}
-                          </Grid.Column>
-                        </Grid.Row>
-                      </Grid>
-                    </Menu.Item>
-                  );
-                })}
+                        </Grid.Column>
+                      </Grid.Row>
+                    </Grid>
+                  </Menu.Item>
+                  ))}
 
                 <Menu.Item name="newM">
                   <Grid>
@@ -137,33 +138,31 @@ class ScenesNavbar extends Component {
                 >
                   <Grid>
                     <Grid.Row>
-                      <Grid.Column>Scene</Grid.Column>
+                      <Grid.Column>Scenes</Grid.Column>
                     </Grid.Row>
                   </Grid>
                 </Dropdown.Item>
 
-                {Object.values(this.props.scenes).map((e, i) => {
-                  return (
-                    <Dropdown.Item
+                {Object.values(this.props.scenes).map((e, i) => (
+                  <Dropdown.Item
+                    id={e.id}
+                    key={i}
+                    name={e.name}
+                    active={this.activeItemScene === e.id}
+                    onClick={this.selectScene}
+                  >
+                    <Grid>
+                      <Grid.Row>
+                        <Grid.Column>{e.name}</Grid.Column>
+                      </Grid.Row>
+                    </Grid>
+                    <SceneModal
+                      ref={this.props.sceneModalRefs[e.id]}
+                      nicolaStop
                       id={e.id}
-                      key={i}
-                      name={e.name}
-                      active={this.activeItemScene === e.id}
-                      onClick={this.selectScene}
-                    >
-                      <Grid>
-                        <Grid.Row>
-                          <Grid.Column>{e.name}</Grid.Column>
-                        </Grid.Row>
-                      </Grid>
-                      <SceneModal
-                        ref={this.props.sceneModalRefs[e.id]}
-                        nicolaStop={true}
-                        id={e.id}
-                      />
-                    </Dropdown.Item>
-                  );
-                })}
+                    />
+                  </Dropdown.Item>
+                  ))}
               </Dropdown.Menu>
             </Dropdown>
           </Menu>
@@ -193,15 +192,13 @@ class ScenesNavbar extends Component {
   }
 }
 
-const setActiveScene = (activeScene) => {
-  return (dispatch) => dispatch(appActions.setActiveScene(activeScene));
-};
+const setActiveScene = (activeScene) => (dispatch) => dispatch(appActions.setActiveScene(activeScene));
 
 const mapStateToProps = (state, _) => ({
   scenes: state.scenes,
   sceneModalRefs: Object.keys(state.scenes).reduce(
     (acc, key) => ({ ...acc, [key]: React.createRef() }),
-    {}
+    {},
   ),
   get isActiveDefaultScene() {
     return state.active.activeScene === -1;
diff --git a/smart-hut/src/views/Signup.js b/smart-hut/src/views/Signup.js
index 5ad8af5..8e79079 100644
--- a/smart-hut/src/views/Signup.js
+++ b/smart-hut/src/views/Signup.js
@@ -1,4 +1,4 @@
-import React, { Component } from "react";
+import React, { Component } from 'react';
 import {
   Button,
   Form,
@@ -8,18 +8,18 @@ import {
   Icon,
   Input,
   Message,
-} from "semantic-ui-react";
-import { Redirect } from "react-router-dom";
-import { Forms } from "../remote";
+} from 'semantic-ui-react';
+import { Redirect } from 'react-router-dom';
+import { Forms } from '../remote';
 
 export default class Signup extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      completeName: "",
-      username: "",
-      email: "",
-      password: "",
+      completeName: '',
+      username: '',
+      email: '',
+      password: '',
       error: { state: false, message: [] },
       success: false,
     };
@@ -36,14 +36,12 @@ export default class Signup extends Component {
 
     Forms.submitRegistration(params)
       .then(() => this.setState({ success: true }))
-      .catch((err) =>
-        this.setState({ error: { state: true, message: err.messages } })
-      );
+      .catch((err) => this.setState({ error: { state: true, message: err.messages } }));
   };
 
   onChangeHandler = (event) => {
-    let nam = event.target.name;
-    let val = event.target.value;
+    const nam = event.target.name;
+    const val = event.target.value;
     this.setState({ [nam]: val });
   };
 
@@ -52,23 +50,26 @@ export default class Signup extends Component {
       return <Redirect to="sent-email-reg" />;
     }
     return (
-      <React.Fragment>
-        <Button circular style={{ margin: "2em" }} href="/">
+      <>
+        <Button circular style={{ margin: '2em' }} href="/">
           <Icon name="arrow alternate circle left" />
-          Go Home{" "}
+          Go Home
+          {' '}
         </Button>
         <Grid
           textAlign="center"
-          style={{ height: "70vh" }}
+          style={{ height: '70vh' }}
           verticalAlign="middle"
         >
           <Grid.Column style={{ maxWidth: 450 }}>
             <Header as="h2" color="blue" textAlign="center">
-              <Image src="img/logo.png" /> Sign-up to SmartHut
+              <Image src="img/logo.png" />
+              {' '}
+Sign-up to SmartHut
             </Header>
             <Form
               size="large"
-              style={{ marginTop: "2em" }}
+              style={{ marginTop: '2em' }}
               error={this.state.error.state}
             >
               <Message error>
@@ -107,16 +108,16 @@ export default class Signup extends Component {
                 iconPosition="left"
                 placeholder="E-mail"
                 onChange={this.onChangeHandler}
-                /*error={{
+                /* error={{
                     content: 'Please enter a valid email address',
                     pointing: 'below',
-                  }}*/
+                  }} */
                 required
               />
               <Form.Input
                 icon="lock"
                 iconPosition="left"
-                placeholder="Password (at least 8 characters)"
+                placeholder="Password (at least 6 characters)"
                 name="password"
                 type="password"
                 onChange={this.onChangeHandler}
@@ -134,7 +135,7 @@ export default class Signup extends Component {
             </Form>
           </Grid.Column>
         </Grid>
-      </React.Fragment>
+      </>
     );
   }
 }
diff --git a/smart-hut/src/views/TestHeaderController.js b/smart-hut/src/views/TestHeaderController.js
index 3c8f681..181f65a 100644
--- a/smart-hut/src/views/TestHeaderController.js
+++ b/smart-hut/src/views/TestHeaderController.js
@@ -1,6 +1,6 @@
-import _ from "lodash";
-import React from "react";
-import HeaderController from "./../components/HeaderController";
+import _ from 'lodash';
+import React from 'react';
+import HeaderController from '../components/HeaderController';
 
 export default class TestHeaderController extends React.Component {
   render() {
diff --git a/smart-hut/src/views/Videocam.js b/smart-hut/src/views/Videocam.js
index 45905ec..a294a7c 100644
--- a/smart-hut/src/views/Videocam.js
+++ b/smart-hut/src/views/Videocam.js
@@ -1,11 +1,12 @@
-import React from "react";
-import VideoTest from "../components/VideoTest";
+import React from 'react';
+import VideoTest from '../components/VideoTest';
 
 export default class TestHeaderController extends React.Component {
   render() {
     return (
       <div>
-        <VideoTest />;
+        <VideoTest />
+;
       </div>
     );
   }
diff --git a/smart-hut/yarn.lock b/smart-hut/yarn.lock
index 4364834..29f6e6b 100644
--- a/smart-hut/yarn.lock
+++ b/smart-hut/yarn.lock
@@ -2,6 +2,11 @@
 # yarn lockfile v1
 
 
+"@ant-design/css-animation@^1.7.2":
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/@ant-design/css-animation/-/css-animation-1.7.2.tgz#4ee5d2ec0fb7cc0a78b44e1c82628bd4621ac7e3"
+  integrity sha512-bvVOe7A+r7lws58B7r+fgnQDK90cV45AXuvGx6i5CCSX1W/M3AJnHsNggDANBxEtWdNdFWcDd5LorB+RdSIlBw==
+
 "@babel/code-frame@7.8.3", "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
@@ -9,16 +14,16 @@
   dependencies:
     "@babel/highlight" "^7.8.3"
 
-"@babel/compat-data@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.8.4.tgz#bbe65d05a291667a8394fe8a0e0e277ef22b0d2a"
-  integrity sha512-lHLhlsvFjJAqNU71b7k6Vv9ewjmTXKvqaMv7n0G1etdCabWLw3nEYE8mmgoVOxMIFE07xOvo7H7XBASirX6Rrg==
+"@babel/compat-data@^7.9.0", "@babel/compat-data@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.6.tgz#3f604c40e420131affe6f2c8052e9a275ae2049b"
+  integrity sha512-5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g==
   dependencies:
-    browserslist "^4.8.5"
+    browserslist "^4.11.1"
     invariant "^2.2.4"
     semver "^5.5.0"
 
-"@babel/core@7.8.4", "@babel/core@^7.1.0", "@babel/core@^7.4.5":
+"@babel/core@7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.4.tgz#d496799e5c12195b3602d0fddd77294e3e38e80e"
   integrity sha512-0LiLrB2PwrVI+a2/IEskBopDYSd8BCb3rOvH7D5tzoWd696TBEduBvuLVm4Nx6rltrLZqvI3MCalB2K2aVzQjA==
@@ -39,22 +44,56 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.4.0", "@babel/generator@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.4.tgz#35bbc74486956fe4251829f9f6c48330e8d0985e"
-  integrity sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==
+"@babel/core@7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e"
+  integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==
   dependencies:
-    "@babel/types" "^7.8.3"
-    jsesc "^2.5.1"
+    "@babel/code-frame" "^7.8.3"
+    "@babel/generator" "^7.9.0"
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helpers" "^7.9.0"
+    "@babel/parser" "^7.9.0"
+    "@babel/template" "^7.8.6"
+    "@babel/traverse" "^7.9.0"
+    "@babel/types" "^7.9.0"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.1"
+    json5 "^2.1.2"
     lodash "^4.17.13"
+    resolve "^1.3.2"
+    semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.8.6":
-  version "7.8.8"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.8.tgz#cdcd58caab730834cee9eeadb729e833b625da3e"
-  integrity sha512-HKyUVu69cZoclptr8t8U5b6sx6zoWjh8jiUhnuj3MpZuKT2dJ8zPTuiy31luq32swhI0SpwItCIlU8XW7BZeJg==
+"@babel/core@^7.1.0", "@babel/core@^7.4.5":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.6.tgz#d9aa1f580abf3b2286ef40b6904d390904c63376"
+  integrity sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==
   dependencies:
-    "@babel/types" "^7.8.7"
+    "@babel/code-frame" "^7.8.3"
+    "@babel/generator" "^7.9.6"
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helpers" "^7.9.6"
+    "@babel/parser" "^7.9.6"
+    "@babel/template" "^7.8.6"
+    "@babel/traverse" "^7.9.6"
+    "@babel/types" "^7.9.6"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.1"
+    json5 "^2.1.2"
+    lodash "^4.17.13"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.4.0", "@babel/generator@^7.8.4", "@babel/generator@^7.9.0", "@babel/generator@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz#5408c82ac5de98cda0d77d8124e99fa1f2170a43"
+  integrity sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==
+  dependencies:
+    "@babel/types" "^7.9.6"
     jsesc "^2.5.1"
     lodash "^4.17.13"
     source-map "^0.5.0"
@@ -74,53 +113,54 @@
     "@babel/helper-explode-assignable-expression" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-builder-react-jsx@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.8.3.tgz#dee98d7d79cc1f003d80b76fe01c7f8945665ff6"
-  integrity sha512-JT8mfnpTkKNCboTqZsQTdGo3l3Ik3l7QIt9hh0O9DYiwVel37VoJpILKM4YFbP2euF32nkQSb+F9cUk9b7DDXQ==
+"@babel/helper-builder-react-jsx-experimental@^7.9.0":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.5.tgz#0b4b3e04e6123f03b404ca4dfd6528fe6bb92fe3"
+  integrity sha512-HAagjAC93tk748jcXpZ7oYRZH485RCq/+yEv9SIWezHRPv9moZArTnkUNciUNzvwHUABmiWKlcxJvMcu59UwTg==
   dependencies:
-    "@babel/types" "^7.8.3"
-    esutils "^2.0.0"
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/types" "^7.9.5"
 
-"@babel/helper-call-delegate@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.3.tgz#de82619898aa605d409c42be6ffb8d7204579692"
-  integrity sha512-6Q05px0Eb+N4/GTyKPPvnkig7Lylw+QzihMpws9iiZQv7ZImf84ZsZpQH7QoWN4n4tm81SnSzPgHw2qtO0Zf3A==
+"@babel/helper-builder-react-jsx@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz#16bf391990b57732700a3278d4d9a81231ea8d32"
+  integrity sha512-weiIo4gaoGgnhff54GQ3P5wsUQmnSwpkvU0r6ZHq6TzoSzKy4JxHEgnxNytaKbov2a9z/CVNyzliuCOUPEX3Jw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/types" "^7.9.0"
 
-"@babel/helper-compilation-targets@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.4.tgz#03d7ecd454b7ebe19a254f76617e61770aed2c88"
-  integrity sha512-3k3BsKMvPp5bjxgMdrFyq0UaEO48HciVrOVF0+lon8pp95cyJ2ujAh0TrBHNMnJGT2rr0iKOJPFFbSqjDyf/Pg==
+"@babel/helper-compilation-targets@^7.8.7", "@babel/helper-compilation-targets@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz#1e05b7ccc9d38d2f8b40b458b380a04dcfadd38a"
+  integrity sha512-x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw==
   dependencies:
-    "@babel/compat-data" "^7.8.4"
-    browserslist "^4.8.5"
+    "@babel/compat-data" "^7.9.6"
+    browserslist "^4.11.1"
     invariant "^2.2.4"
     levenary "^1.1.1"
     semver "^5.5.0"
 
-"@babel/helper-create-class-features-plugin@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.3.tgz#5b94be88c255f140fd2c10dd151e7f98f4bff397"
-  integrity sha512-qmp4pD7zeTxsv0JNecSBsEmG1ei2MqwJq4YQcK3ZWm/0t07QstWfvuV/vm3Qt5xNMFETn2SZqpMx2MQzbtq+KA==
+"@babel/helper-create-class-features-plugin@^7.8.3", "@babel/helper-create-class-features-plugin@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz#965c8b0a9f051801fd9d3b372ca0ccf200a90897"
+  integrity sha512-6N9IeuyHvMBRyjNYOMJHrhwtu4WJMrYf8hVbEHD3pbbbmNOk1kmXSQs7bA4dYDUaIx4ZEzdnvo6NwC3WHd/Qow==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
+    "@babel/helper-function-name" "^7.9.5"
     "@babel/helper-member-expression-to-functions" "^7.8.3"
     "@babel/helper-optimise-call-expression" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.9.6"
     "@babel/helper-split-export-declaration" "^7.8.3"
 
-"@babel/helper-create-regexp-features-plugin@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.3.tgz#c774268c95ec07ee92476a3862b75cc2839beb79"
-  integrity sha512-Gcsm1OHCUr9o9TcJln57xhWHtdXbA2pgQ58S0Lxlks0WMGNXuki4+GLfX0p+L2ZkINUGZvfkz8rzoqJQSthI+Q==
+"@babel/helper-create-regexp-features-plugin@^7.8.3", "@babel/helper-create-regexp-features-plugin@^7.8.8":
+  version "7.8.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087"
+  integrity sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==
   dependencies:
+    "@babel/helper-annotate-as-pure" "^7.8.3"
     "@babel/helper-regex" "^7.8.3"
-    regexpu-core "^4.6.0"
+    regexpu-core "^4.7.0"
 
 "@babel/helper-define-map@^7.8.3":
   version "7.8.3"
@@ -139,14 +179,14 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-function-name@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"
-  integrity sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==
+"@babel/helper-function-name@^7.8.3", "@babel/helper-function-name@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
+  integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
   dependencies:
     "@babel/helper-get-function-arity" "^7.8.3"
     "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.9.5"
 
 "@babel/helper-get-function-arity@^7.8.3":
   version "7.8.3"
@@ -176,16 +216,17 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-module-transforms@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.8.3.tgz#d305e35d02bee720fbc2c3c3623aa0c316c01590"
-  integrity sha512-C7NG6B7vfBa/pwCOshpMbOYUmrYQDfCpVL/JCRu0ek8B5p8kue1+BCXpg2vOYs7w5ACB9GTOBYQ5U6NwrMg+3Q==
+"@babel/helper-module-transforms@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
+  integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
   dependencies:
     "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
     "@babel/helper-simple-access" "^7.8.3"
     "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/template" "^7.8.6"
+    "@babel/types" "^7.9.0"
     lodash "^4.17.13"
 
 "@babel/helper-optimise-call-expression@^7.8.3":
@@ -218,15 +259,15 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-replace-supers@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.3.tgz#91192d25f6abbcd41da8a989d4492574fb1530bc"
-  integrity sha512-xOUssL6ho41U81etpLoT2RTdvdus4VfHamCuAm4AHxGr+0it5fnwoVdwUJ7GFEqCsQYzJUhcbsN9wB9apcYKFA==
+"@babel/helper-replace-supers@^7.8.3", "@babel/helper-replace-supers@^7.8.6", "@babel/helper-replace-supers@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz#03149d7e6a5586ab6764996cd31d6981a17e1444"
+  integrity sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==
   dependencies:
     "@babel/helper-member-expression-to-functions" "^7.8.3"
     "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/traverse" "^7.9.6"
+    "@babel/types" "^7.9.6"
 
 "@babel/helper-simple-access@^7.8.3":
   version "7.8.3"
@@ -243,6 +284,11 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
+"@babel/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
+  integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
+
 "@babel/helper-wrap-function@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
@@ -253,33 +299,28 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helpers@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.4.tgz#754eb3ee727c165e0a240d6c207de7c455f36f73"
-  integrity sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==
+"@babel/helpers@^7.8.4", "@babel/helpers@^7.9.0", "@babel/helpers@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.6.tgz#092c774743471d0bb6c7de3ad465ab3d3486d580"
+  integrity sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==
   dependencies:
     "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.4"
-    "@babel/types" "^7.8.3"
+    "@babel/traverse" "^7.9.6"
+    "@babel/types" "^7.9.6"
 
 "@babel/highlight@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797"
-  integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
+  integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==
   dependencies:
+    "@babel/helper-validator-identifier" "^7.9.0"
     chalk "^2.0.0"
-    esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.8.3", "@babel/parser@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz#d1dbe64691d60358a974295fa53da074dd2ce8e8"
-  integrity sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==
-
-"@babel/parser@^7.8.6":
-  version "7.8.8"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.8.tgz#4c3b7ce36db37e0629be1f0d50a571d2f86f6cd4"
-  integrity sha512-mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA==
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.8.4", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0", "@babel/parser@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7"
+  integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==
 
 "@babel/plugin-proposal-async-generator-functions@^7.8.3":
   version "7.8.3"
@@ -323,7 +364,7 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
+"@babel/plugin-proposal-nullish-coalescing-operator@7.8.3", "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2"
   integrity sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==
@@ -331,7 +372,7 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
-"@babel/plugin-proposal-numeric-separator@7.8.3":
+"@babel/plugin-proposal-numeric-separator@7.8.3", "@babel/plugin-proposal-numeric-separator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
   integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==
@@ -339,13 +380,14 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-numeric-separator" "^7.8.3"
 
-"@babel/plugin-proposal-object-rest-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz#eb5ae366118ddca67bed583b53d7554cad9951bb"
-  integrity sha512-8qvuPwU/xxUCt78HocNlv0mXXo0wdh9VT1R04WU8HGOfaOob26pF+9P5/lYjN/q7DHOX1bvX60hnhOvuQUJdbA==
+"@babel/plugin-proposal-object-rest-spread@^7.9.0", "@babel/plugin-proposal-object-rest-spread@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz#7a093586fcb18b08266eb1a7177da671ac575b63"
+  integrity sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
+    "@babel/plugin-transform-parameters" "^7.9.5"
 
 "@babel/plugin-proposal-optional-catch-binding@^7.8.3":
   version "7.8.3"
@@ -355,20 +397,20 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz#ae10b3214cb25f7adb1f3bc87ba42ca10b7e2543"
-  integrity sha512-QIoIR9abkVn+seDE3OjA08jWcs3eZ9+wJCKSRgo3WdEU2csFYgdScb+8qHB3+WXsGJD55u+5hWCISI7ejXS+kg==
+"@babel/plugin-proposal-optional-chaining@7.9.0", "@babel/plugin-proposal-optional-chaining@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
+  integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.3.tgz#b646c3adea5f98800c9ab45105ac34d06cd4a47f"
-  integrity sha512-1/1/rEZv2XGweRwwSkLpY+s60za9OZ1hJs4YDqFHCw0kYWYwL5IFljVY1MYBL+weT1l9pokDO2uhSTLVxzoHkQ==
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
+  version "7.8.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"
+  integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.8.8"
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-syntax-async-generators@^7.8.0":
@@ -420,7 +462,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.8.3":
+"@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
   integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
@@ -493,17 +535,17 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     lodash "^4.17.13"
 
-"@babel/plugin-transform-classes@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.3.tgz#46fd7a9d2bb9ea89ce88720477979fe0d71b21b8"
-  integrity sha512-SjT0cwFJ+7Rbr1vQsvphAHwUHvSUPmMjMU/0P59G8U2HLFqSa082JO7zkbDNWs9kH/IUqpHI6xWNesGf8haF1w==
+"@babel/plugin-transform-classes@^7.9.0", "@babel/plugin-transform-classes@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz#800597ddb8aefc2c293ed27459c1fcc935a26c2c"
+  integrity sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.8.3"
     "@babel/helper-define-map" "^7.8.3"
-    "@babel/helper-function-name" "^7.8.3"
+    "@babel/helper-function-name" "^7.9.5"
     "@babel/helper-optimise-call-expression" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
     "@babel/helper-split-export-declaration" "^7.8.3"
     globals "^11.1.0"
 
@@ -514,14 +556,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-destructuring@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.3.tgz#20ddfbd9e4676906b1056ee60af88590cc7aaa0b"
-  integrity sha512-H4X646nCkiEcHZUZaRkhE2XVsoz0J/1x3VVujnn96pSoGCtKPA99ZZA+va+gK+92Zycd6OBKCD8tDb/731bhgQ==
+"@babel/plugin-transform-destructuring@^7.8.3", "@babel/plugin-transform-destructuring@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz#72c97cf5f38604aea3abf3b935b0e17b1db76a50"
+  integrity sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-dotall-regex@^7.8.3":
+"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"
   integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==
@@ -544,18 +586,18 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-flow-strip-types@7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.8.3.tgz#da705a655466b2a9b36046b57bf0cbcd53551bd4"
-  integrity sha512-g/6WTWG/xbdd2exBBzMfygjX/zw4eyNC4X8pRaq7aRHRoDUCzAIu3kGYIXviOv8BjCuWm8vDBwjHcjiRNgXrPA==
+"@babel/plugin-transform-flow-strip-types@7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.9.0.tgz#8a3538aa40434e000b8f44a3c5c9ac7229bd2392"
+  integrity sha512-7Qfg0lKQhEHs93FChxVLAvhBshOPQDtJUTVHr/ZwQNRccCm4O9D79r9tVSoV8iNwjP1YgfD+e/fgHcPkN1qEQg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-flow" "^7.8.3"
 
-"@babel/plugin-transform-for-of@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.4.tgz#6fe8eae5d6875086ee185dd0b098a8513783b47d"
-  integrity sha512-iAXNlOWvcYUYoV8YIxwS7TxGRJcxyl8eQCfT+A5j8sKUzRFvJdcyjp97jL2IghWSRDaL2PU2O2tX8Cu9dTBq5A==
+"@babel/plugin-transform-for-of@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e"
+  integrity sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
@@ -581,41 +623,41 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-modules-amd@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz#65606d44616b50225e76f5578f33c568a0b876a5"
-  integrity sha512-MadJiU3rLKclzT5kBH4yxdry96odTUwuqrZM+GllFI/VhxfPz+k9MshJM+MwhfkCdxxclSbSBbUGciBngR+kEQ==
+"@babel/plugin-transform-modules-amd@^7.9.0", "@babel/plugin-transform-modules-amd@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz#8539ec42c153d12ea3836e0e3ac30d5aae7b258e"
+  integrity sha512-zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
-    babel-plugin-dynamic-import-node "^2.3.0"
+    babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz#df251706ec331bd058a34bdd72613915f82928a5"
-  integrity sha512-JpdMEfA15HZ/1gNuB9XEDlZM1h/gF/YOH7zaZzQu2xCFRfwc01NXBMHHSTT6hRjlXJJs5x/bfODM3LiCk94Sxg==
+"@babel/plugin-transform-modules-commonjs@^7.9.0", "@babel/plugin-transform-modules-commonjs@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz#64b7474a4279ee588cacd1906695ca721687c277"
+  integrity sha512-7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-simple-access" "^7.8.3"
-    babel-plugin-dynamic-import-node "^2.3.0"
+    babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz#d8bbf222c1dbe3661f440f2f00c16e9bb7d0d420"
-  integrity sha512-8cESMCJjmArMYqa9AO5YuMEkE4ds28tMpZcGZB/jl3n0ZzlsxOAi3mC+SKypTfT8gjMupCnd3YiXCkMjj2jfOg==
+"@babel/plugin-transform-modules-systemjs@^7.9.0", "@babel/plugin-transform-modules-systemjs@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz#207f1461c78a231d5337a92140e52422510d81a4"
+  integrity sha512-NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg==
   dependencies:
     "@babel/helper-hoist-variables" "^7.8.3"
-    "@babel/helper-module-transforms" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
-    babel-plugin-dynamic-import-node "^2.3.0"
+    babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz#592d578ce06c52f5b98b02f913d653ffe972661a"
-  integrity sha512-evhTyWhbwbI3/U6dZAnx/ePoV7H6OUG+OjiJFHmhr9FPn0VShjwC2kdxqIuQ/+1P50TMrneGzMeyMTFOjKSnAw==
+"@babel/plugin-transform-modules-umd@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697"
+  integrity sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
@@ -640,12 +682,11 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-replace-supers" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.4.tgz#1d5155de0b65db0ccf9971165745d3bb990d77d3"
-  integrity sha512-IsS3oTxeTsZlE5KqzTbcC2sV0P9pXdec53SU+Yxv7o/6dvGM5AkTotQKhoSffhNgZ/dftsSiOoxy7evCYJXzVA==
+"@babel/plugin-transform-parameters@^7.8.7", "@babel/plugin-transform-parameters@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795"
+  integrity sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==
   dependencies:
-    "@babel/helper-call-delegate" "^7.8.3"
     "@babel/helper-get-function-arity" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
@@ -657,11 +698,10 @@
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-transform-react-constant-elements@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.8.3.tgz#784c25294bddaad2323eb4ff0c9f4a3f6c87d6bc"
-  integrity sha512-glrzN2U+egwRfkNFtL34xIBYTxbbUF2qJTP8HD3qETBBqzAWSeNB821X0GjU06+dNpq/UyCIjI72FmGE5NNkQQ==
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.9.0.tgz#a75abc936a3819edec42d3386d9f1c93f28d9d9e"
+  integrity sha512-wXMXsToAUOxJuBBEHajqKLFWcCkOSLshTI2ChCFFj1zDd7od4IOxiwLCOObNUvOpkxLpjIuaIdBMmNt6ocCPAw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-transform-react-display-name@7.8.3", "@babel/plugin-transform-react-display-name@^7.8.3":
@@ -671,37 +711,47 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx-self@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.8.3.tgz#c4f178b2aa588ecfa8d077ea80d4194ee77ed702"
-  integrity sha512-01OT7s5oa0XTLf2I8XGsL8+KqV9lx3EZV+jxn/L2LQ97CGKila2YMroTkCEIE0HV/FF7CMSRsIAybopdN9NTdg==
+"@babel/plugin-transform-react-jsx-development@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.9.0.tgz#3c2a130727caf00c2a293f0aed24520825dbf754"
+  integrity sha512-tK8hWKrQncVvrhvtOiPpKrQjfNX3DtkNLSX4ObuGcpS9p0QrGetKmlySIGR07y48Zft8WVgPakqd/bk46JrMSw==
+  dependencies:
+    "@babel/helper-builder-react-jsx-experimental" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-jsx" "^7.8.3"
+
+"@babel/plugin-transform-react-jsx-self@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz#f4f26a325820205239bb915bad8e06fcadabb49b"
+  integrity sha512-K2ObbWPKT7KUTAoyjCsFilOkEgMvFG+y0FqOl6Lezd0/13kMkkjHskVsZvblRPj1PHA44PrToaZANrryppzTvQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx-source@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.8.3.tgz#951e75a8af47f9f120db731be095d2b2c34920e0"
-  integrity sha512-PLMgdMGuVDtRS/SzjNEQYUT8f4z1xb2BAT54vM1X5efkVuYBf5WyGUMbpmARcfq3NaglIwz08UVQK4HHHbC6ag==
+"@babel/plugin-transform-react-jsx-source@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz#89ef93025240dd5d17d3122294a093e5e0183de0"
+  integrity sha512-K6m3LlSnTSfRkM6FcRk8saNEeaeyG5k7AVkBU2bZK3+1zdkSED3qNdsWrUgQBeTVD2Tp3VMmerxVO2yM5iITmw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.8.3.tgz#4220349c0390fdefa505365f68c103562ab2fc4a"
-  integrity sha512-r0h+mUiyL595ikykci+fbwm9YzmuOrUBi0b+FDIKmi3fPQyFokWVEMJnRWHJPPQEjyFJyna9WZC6Viv6UHSv1g==
+"@babel/plugin-transform-react-jsx@^7.9.1", "@babel/plugin-transform-react-jsx@^7.9.4":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz#86f576c8540bd06d0e95e0b61ea76d55f6cbd03f"
+  integrity sha512-Mjqf3pZBNLt854CK0C/kRuXAnE6H/bo7xYojP+WGtX8glDGSibcwnsWwhwoSuRg0+EBnxPC1ouVnuetUIlPSAw==
   dependencies:
-    "@babel/helper-builder-react-jsx" "^7.8.3"
+    "@babel/helper-builder-react-jsx" "^7.9.0"
+    "@babel/helper-builder-react-jsx-experimental" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-regenerator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.3.tgz#b31031e8059c07495bf23614c97f3d9698bc6ec8"
-  integrity sha512-qt/kcur/FxrQrzFR432FGZznkVAjiyFtCOANjkAKwCbt465L6ZCiUQh2oMYGU3Wo8LRFJxNDFwWn106S5wVUNA==
+"@babel/plugin-transform-regenerator@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
+  integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==
   dependencies:
-    regenerator-transform "^0.14.0"
+    regenerator-transform "^0.14.2"
 
 "@babel/plugin-transform-reserved-words@^7.8.3":
   version "7.8.3"
@@ -710,10 +760,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-runtime@7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.8.3.tgz#c0153bc0a5375ebc1f1591cb7eea223adea9f169"
-  integrity sha512-/vqUt5Yh+cgPZXXjmaG9NT8aVfThKk7G4OqkVhrXqwsC5soMn/qTCxs36rZ2QFhpfTJcjw4SNDIZ4RUb8OL4jQ==
+"@babel/plugin-transform-runtime@7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz#45468c0ae74cc13204e1d3b1f4ce6ee83258af0b"
+  integrity sha512-pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw==
   dependencies:
     "@babel/helper-module-imports" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
@@ -757,12 +807,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-typescript@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.3.tgz#be6f01a7ef423be68e65ace1f04fc407e6d88917"
-  integrity sha512-Ebj230AxcrKGZPKIp4g4TdQLrqX95TobLUWKd/CwG7X1XHUH1ZpkpFvXuXqWbtGRWb7uuEWNlrl681wsOArAdQ==
+"@babel/plugin-transform-typescript@^7.9.0":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.6.tgz#2248971416a506fc78278fc0c0ea3179224af1e9"
+  integrity sha512-8OvsRdvpt3Iesf2qsAn+YdlwAJD7zJ+vhFZmDCa4b8dTp7MmHtKk5FF2mCsGxjZwuwsy/yIIay/nLmxST1ctVQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.9.6"
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-typescript" "^7.8.3"
 
@@ -774,27 +824,29 @@
     "@babel/helper-create-regexp-features-plugin" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/preset-env@7.8.4", "@babel/preset-env@^7.4.5":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.4.tgz#9dac6df5f423015d3d49b6e9e5fa3413e4a72c4e"
-  integrity sha512-HihCgpr45AnSOHRbS5cWNTINs0TwaR8BS8xIIH+QwiW8cKL0llV91njQMpeMReEPVs+1Ao0x3RLEBLtt1hOq4w==
+"@babel/preset-env@7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.0.tgz#a5fc42480e950ae8f5d9f8f2bbc03f52722df3a8"
+  integrity sha512-712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ==
   dependencies:
-    "@babel/compat-data" "^7.8.4"
-    "@babel/helper-compilation-targets" "^7.8.4"
+    "@babel/compat-data" "^7.9.0"
+    "@babel/helper-compilation-targets" "^7.8.7"
     "@babel/helper-module-imports" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
     "@babel/plugin-proposal-dynamic-import" "^7.8.3"
     "@babel/plugin-proposal-json-strings" "^7.8.3"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-proposal-object-rest-spread" "^7.8.3"
+    "@babel/plugin-proposal-numeric-separator" "^7.8.3"
+    "@babel/plugin-proposal-object-rest-spread" "^7.9.0"
     "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-proposal-optional-chaining" "^7.8.3"
+    "@babel/plugin-proposal-optional-chaining" "^7.9.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
@@ -803,26 +855,26 @@
     "@babel/plugin-transform-async-to-generator" "^7.8.3"
     "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
     "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@babel/plugin-transform-classes" "^7.8.3"
+    "@babel/plugin-transform-classes" "^7.9.0"
     "@babel/plugin-transform-computed-properties" "^7.8.3"
     "@babel/plugin-transform-destructuring" "^7.8.3"
     "@babel/plugin-transform-dotall-regex" "^7.8.3"
     "@babel/plugin-transform-duplicate-keys" "^7.8.3"
     "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
-    "@babel/plugin-transform-for-of" "^7.8.4"
+    "@babel/plugin-transform-for-of" "^7.9.0"
     "@babel/plugin-transform-function-name" "^7.8.3"
     "@babel/plugin-transform-literals" "^7.8.3"
     "@babel/plugin-transform-member-expression-literals" "^7.8.3"
-    "@babel/plugin-transform-modules-amd" "^7.8.3"
-    "@babel/plugin-transform-modules-commonjs" "^7.8.3"
-    "@babel/plugin-transform-modules-systemjs" "^7.8.3"
-    "@babel/plugin-transform-modules-umd" "^7.8.3"
+    "@babel/plugin-transform-modules-amd" "^7.9.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.9.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.9.0"
+    "@babel/plugin-transform-modules-umd" "^7.9.0"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
     "@babel/plugin-transform-new-target" "^7.8.3"
     "@babel/plugin-transform-object-super" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.8.4"
+    "@babel/plugin-transform-parameters" "^7.8.7"
     "@babel/plugin-transform-property-literals" "^7.8.3"
-    "@babel/plugin-transform-regenerator" "^7.8.3"
+    "@babel/plugin-transform-regenerator" "^7.8.7"
     "@babel/plugin-transform-reserved-words" "^7.8.3"
     "@babel/plugin-transform-shorthand-properties" "^7.8.3"
     "@babel/plugin-transform-spread" "^7.8.3"
@@ -830,108 +882,190 @@
     "@babel/plugin-transform-template-literals" "^7.8.3"
     "@babel/plugin-transform-typeof-symbol" "^7.8.4"
     "@babel/plugin-transform-unicode-regex" "^7.8.3"
-    "@babel/types" "^7.8.3"
-    browserslist "^4.8.5"
+    "@babel/preset-modules" "^0.1.3"
+    "@babel/types" "^7.9.0"
+    browserslist "^4.9.1"
     core-js-compat "^3.6.2"
     invariant "^2.2.2"
     levenary "^1.1.1"
     semver "^5.5.0"
 
-"@babel/preset-react@7.8.3", "@babel/preset-react@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.8.3.tgz#23dc63f1b5b0751283e04252e78cf1d6589273d2"
-  integrity sha512-9hx0CwZg92jGb7iHYQVgi0tOEHP/kM60CtWJQnmbATSPIQQ2xYzfoCI3EdqAhFBeeJwYMdWQuDUHMsuDbH9hyQ==
+"@babel/preset-env@^7.4.5":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.6.tgz#df063b276c6455ec6fcfc6e53aacc38da9b0aea6"
+  integrity sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==
+  dependencies:
+    "@babel/compat-data" "^7.9.6"
+    "@babel/helper-compilation-targets" "^7.9.6"
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
+    "@babel/plugin-proposal-dynamic-import" "^7.8.3"
+    "@babel/plugin-proposal-json-strings" "^7.8.3"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-proposal-numeric-separator" "^7.8.3"
+    "@babel/plugin-proposal-object-rest-spread" "^7.9.6"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-proposal-optional-chaining" "^7.9.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
+    "@babel/plugin-syntax-async-generators" "^7.8.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+    "@babel/plugin-syntax-top-level-await" "^7.8.3"
+    "@babel/plugin-transform-arrow-functions" "^7.8.3"
+    "@babel/plugin-transform-async-to-generator" "^7.8.3"
+    "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
+    "@babel/plugin-transform-block-scoping" "^7.8.3"
+    "@babel/plugin-transform-classes" "^7.9.5"
+    "@babel/plugin-transform-computed-properties" "^7.8.3"
+    "@babel/plugin-transform-destructuring" "^7.9.5"
+    "@babel/plugin-transform-dotall-regex" "^7.8.3"
+    "@babel/plugin-transform-duplicate-keys" "^7.8.3"
+    "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
+    "@babel/plugin-transform-for-of" "^7.9.0"
+    "@babel/plugin-transform-function-name" "^7.8.3"
+    "@babel/plugin-transform-literals" "^7.8.3"
+    "@babel/plugin-transform-member-expression-literals" "^7.8.3"
+    "@babel/plugin-transform-modules-amd" "^7.9.6"
+    "@babel/plugin-transform-modules-commonjs" "^7.9.6"
+    "@babel/plugin-transform-modules-systemjs" "^7.9.6"
+    "@babel/plugin-transform-modules-umd" "^7.9.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
+    "@babel/plugin-transform-new-target" "^7.8.3"
+    "@babel/plugin-transform-object-super" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.9.5"
+    "@babel/plugin-transform-property-literals" "^7.8.3"
+    "@babel/plugin-transform-regenerator" "^7.8.7"
+    "@babel/plugin-transform-reserved-words" "^7.8.3"
+    "@babel/plugin-transform-shorthand-properties" "^7.8.3"
+    "@babel/plugin-transform-spread" "^7.8.3"
+    "@babel/plugin-transform-sticky-regex" "^7.8.3"
+    "@babel/plugin-transform-template-literals" "^7.8.3"
+    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
+    "@babel/plugin-transform-unicode-regex" "^7.8.3"
+    "@babel/preset-modules" "^0.1.3"
+    "@babel/types" "^7.9.6"
+    browserslist "^4.11.1"
+    core-js-compat "^3.6.2"
+    invariant "^2.2.2"
+    levenary "^1.1.1"
+    semver "^5.5.0"
+
+"@babel/preset-modules@^0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"
+  integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+    "@babel/plugin-transform-dotall-regex" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    esutils "^2.0.2"
+
+"@babel/preset-react@7.9.1":
+  version "7.9.1"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.1.tgz#b346403c36d58c3bb544148272a0cefd9c28677a"
+  integrity sha512-aJBYF23MPj0RNdp/4bHnAP0NVqqZRr9kl0NAOP4nJCex6OYVio59+dnQzsAWFuogdLyeaKA1hmfUIVZkY5J+TQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-transform-react-display-name" "^7.8.3"
-    "@babel/plugin-transform-react-jsx" "^7.8.3"
-    "@babel/plugin-transform-react-jsx-self" "^7.8.3"
-    "@babel/plugin-transform-react-jsx-source" "^7.8.3"
+    "@babel/plugin-transform-react-jsx" "^7.9.1"
+    "@babel/plugin-transform-react-jsx-development" "^7.9.0"
+    "@babel/plugin-transform-react-jsx-self" "^7.9.0"
+    "@babel/plugin-transform-react-jsx-source" "^7.9.0"
 
-"@babel/preset-typescript@7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.8.3.tgz#90af8690121beecd9a75d0cc26c6be39d1595d13"
-  integrity sha512-qee5LgPGui9zQ0jR1TeU5/fP9L+ovoArklEqY12ek8P/wV5ZeM/VYSQYwICeoT6FfpJTekG9Ilay5PhwsOpMHA==
+"@babel/preset-react@^7.0.0":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.4.tgz#c6c97693ac65b6b9c0b4f25b948a8f665463014d"
+  integrity sha512-AxylVB3FXeOTQXNXyiuAQJSvss62FEotbX2Pzx3K/7c+MKJMdSg6Ose6QYllkdCFA8EInCJVw7M/o5QbLuA4ZQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-transform-typescript" "^7.8.3"
+    "@babel/plugin-transform-react-display-name" "^7.8.3"
+    "@babel/plugin-transform-react-jsx" "^7.9.4"
+    "@babel/plugin-transform-react-jsx-development" "^7.9.0"
+    "@babel/plugin-transform-react-jsx-self" "^7.9.0"
+    "@babel/plugin-transform-react-jsx-source" "^7.9.0"
+
+"@babel/preset-typescript@7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz#87705a72b1f0d59df21c179f7c3d2ef4b16ce192"
+  integrity sha512-S4cueFnGrIbvYJgwsVFKdvOmpiL0XGw9MFW9D0vgRys5g36PBhZRL8NX8Gr2akz8XRtzq6HuDXPD/1nniagNUg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-transform-typescript" "^7.9.0"
 
 "@babel/runtime-corejs3@^7.7.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.8.4.tgz#ccc4e042e2fae419c67fa709567e5d2179ed3940"
-  integrity sha512-+wpLqy5+fbQhvbllvlJEVRIpYj+COUWnnsm+I4jZlA8Lo7/MJmBhGTCHyk1/RWfOqBRJ2MbadddG6QltTKTlrg==
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz#67aded13fffbbc2cb93247388cf84d77a4be9a71"
+  integrity sha512-6toWAfaALQjt3KMZQc6fABqZwUDDuWzz+cAfPhqyEnzxvdWOAkjwPNxgF8xlmo7OWLsSjaKjsskpKHRLaMArOA==
   dependencies:
     core-js-pure "^3.0.0"
-    regenerator-runtime "^0.13.2"
+    regenerator-runtime "^0.13.4"
 
-"@babel/runtime@7.8.4", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.8.3":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308"
-  integrity sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==
+"@babel/runtime@7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.0.tgz#337eda67401f5b066a6f205a3113d4ac18ba495b"
+  integrity sha512-cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA==
   dependencies:
-    regenerator-runtime "^0.13.2"
+    regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.4.0", "@babel/template@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8"
-  integrity sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==
+<<<<<<< HEAD
+<<<<<<< HEAD
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+=======
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f"
+  integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==
   dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/parser" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    regenerator-runtime "^0.13.4"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.4.tgz#f0845822365f9d5b0e312ed3959d3f827f869e3c"
-  integrity sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.8.4"
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.8.4"
-    "@babel/types" "^7.8.3"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
-"@babel/traverse@^7.4.5":
+"@babel/template@^7.4.0", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
   version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.6.tgz#acfe0c64e1cd991b3e32eae813a6eb564954b5ff"
-  integrity sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
+  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
   dependencies:
     "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.8.6"
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/helper-split-export-declaration" "^7.8.3"
     "@babel/parser" "^7.8.6"
     "@babel/types" "^7.8.6"
+
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.5", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4", "@babel/traverse@^7.9.0", "@babel/traverse@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz#5540d7577697bf619cc57b92aa0f1c231a94f442"
+  integrity sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/generator" "^7.9.6"
+    "@babel/helper-function-name" "^7.9.5"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/parser" "^7.9.6"
+    "@babel/types" "^7.9.6"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c"
-  integrity sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==
+"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5", "@babel/types@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz#2c5502b427251e9de1bd2dff95add646d95cc9f7"
+  integrity sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==
   dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.13"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.8.6", "@babel/types@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.7.tgz#1fc9729e1acbb2337d5b6977a63979b4819f5d1d"
-  integrity sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==
-  dependencies:
-    esutils "^2.0.2"
+    "@babel/helper-validator-identifier" "^7.9.5"
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
 "@cnakazawa/watch@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
-  integrity sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
+  integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==
   dependencies:
     exec-sh "^0.3.2"
     minimist "^1.2.0"
@@ -946,12 +1080,12 @@
   resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-10.1.0.tgz#f0950bba18819512d42f7197e56c518aa491cf18"
   integrity sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg==
 
-"@emotion/hash@^0.7.4":
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.4.tgz#f14932887422c9056b15a8d222a9074a7dfa2831"
-  integrity sha512-fxfMSBMX3tlIbKUdtGKxqB1fyrH6gVrX39Gsv3y8lRYKUqlgDt3UMqQyGnR1bQMa2B8aGnhLZokZgg8vT0Le+A==
+"@emotion/hash@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
+  integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
 
-"@emotion/is-prop-valid@^0.8.3":
+"@emotion/is-prop-valid@^0.8.8":
   version "0.8.8"
   resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a"
   integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==
@@ -974,9 +1108,9 @@
   integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
 
 "@giantmachines/redux-websocket@^1.1.7":
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/@giantmachines/redux-websocket/-/redux-websocket-1.1.7.tgz#8c045a359cd3f9a73ef141ce722fd14ae754cd1b"
-  integrity sha512-t90k+NcVInXvppMVpU3c7ZC6i58S/jBPqltckAlKfrtc92YmGZ/He3qYT9OiemlvS+/d+R6P/Ed4yEqKVevYdg==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@giantmachines/redux-websocket/-/redux-websocket-1.2.0.tgz#389f4b1d8f6e06d973b0b55bea8df5d9ab286091"
+  integrity sha512-87GXE32CnsA9/AA7jVDQupWLmycHAuoWPwNCTz2YnlRR1l8EqLlOJK6SyeMQaVRIuAvM5B7e06dylmaS9Jlgnw==
   dependencies:
     redux "~4"
 
@@ -991,9 +1125,9 @@
   integrity sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==
 
 "@hapi/hoek@8.x.x", "@hapi/hoek@^8.3.0":
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.0.tgz#2f9ce301c8898e1c3248b0a8564696b24d1a9a5a"
-  integrity sha512-7XYT10CZfPsH7j9F1Jmg1+d0ezOux2oM2GfArAzLwWe4mE2Dr3hVjsAL6+TFY49RRJlCdJDMw3nJsLFroTc8Kw==
+  version "8.5.1"
+  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.1.tgz#fde96064ca446dec8c55a8c2f130957b070c6e06"
+  integrity sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==
 
 "@hapi/joi@^15.0.0":
   version "15.1.1"
@@ -1160,23 +1294,59 @@
     "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^13.0.0"
 
+"@jest/types@^25.5.0":
+  version "25.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz#4d6a4793f7b9599fc3680877b856a97dbccf2a9d"
+  integrity sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^1.1.1"
+    "@types/yargs" "^15.0.0"
+    chalk "^3.0.0"
+
 "@material-ui/core@^4.9.4":
-  version "4.9.4"
-  resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.9.4.tgz#796515b12845dc6ea7e21872888cfc4c0c1c1efe"
-  integrity sha512-1wqm3jBC8mGpVHu0wVOYBX7LUzkPsWxkkTtKSn0Hz66T6TDJkke72mkSIL7akNdjnxy+bRc2Vi6NiJ4YutkDcw==
+<<<<<<< HEAD
+<<<<<<< HEAD
+  version "4.9.13"
+  resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.9.13.tgz#024962bcdda05139e1bad17a1815bf4088702b15"
+  integrity sha512-GEXNwUr+laZ0N+F1efmHB64Fyg+uQIRXLqbSejg3ebSXgLYNpIjnMOPRfWdu4rICq0dAIgvvNXGkKDMcf3AMpA==
   dependencies:
     "@babel/runtime" "^7.4.4"
-    "@material-ui/styles" "^4.9.0"
-    "@material-ui/system" "^4.9.3"
-    "@material-ui/types" "^5.0.0"
-    "@material-ui/utils" "^4.7.1"
+    "@material-ui/react-transition-group" "^4.3.0"
+    "@material-ui/styles" "^4.9.13"
+    "@material-ui/system" "^4.9.13"
+    "@material-ui/types" "^5.0.1"
+=======
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+  version "4.9.14"
+  resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.9.14.tgz#4388f82cf94554cd3a935774fc12820f3c607a8a"
+  integrity sha512-71oYrOpInx5honJ9GzZlygPjmsFhn7Bui61/SWLJsPTkMnfvuZfU3qVqlEHjXyDsnZ+uKmLAIdsrOYnphJxxXw==
+  dependencies:
+    "@babel/runtime" "^7.4.4"
+    "@material-ui/styles" "^4.9.14"
+    "@material-ui/system" "^4.9.14"
+    "@material-ui/types" "^5.1.0"
+<<<<<<< HEAD
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+    "@material-ui/utils" "^4.9.12"
     "@types/react-transition-group" "^4.2.0"
-    clsx "^1.0.2"
+    clsx "^1.0.4"
     hoist-non-react-statics "^3.3.2"
-    popper.js "^1.14.1"
+    popper.js "^1.16.1-lts"
     prop-types "^15.7.2"
     react-is "^16.8.0"
+<<<<<<< HEAD
+<<<<<<< HEAD
     react-transition-group "^4.3.0"
+=======
+    react-transition-group "^4.4.0"
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+    react-transition-group "^4.4.0"
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
 
 "@material-ui/icons@^4.9.1":
   version "4.9.1"
@@ -1185,18 +1355,45 @@
   dependencies:
     "@babel/runtime" "^7.4.4"
 
-"@material-ui/styles@^4.9.0":
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.9.0.tgz#10c31859f6868cfa9d3adf6b6c3e32c9d676bc76"
-  integrity sha512-nJHum4RqYBPWsjL/9JET8Z02FZ9gSizlg/7LWVFpIthNzpK6OQ5OSRR4T4x9/p+wK3t1qNn3b1uI4XpnZaPxOA==
+<<<<<<< HEAD
+<<<<<<< HEAD
+"@material-ui/react-transition-group@^4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@material-ui/react-transition-group/-/react-transition-group-4.3.0.tgz#92529142addb5cc179dbf42d246c7e3fe4d6104b"
+  integrity sha512-CwQ0aXrlUynUTY6sh3UvKuvye1o92en20VGAs6TORnSxUYeRmkX8YeTUN3lAkGiBX1z222FxLFO36WWh6q73rQ==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    dom-helpers "^5.0.1"
+    loose-envify "^1.4.0"
+    prop-types "^15.6.2"
+
+"@material-ui/styles@^4.9.13":
+  version "4.9.13"
+  resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.9.13.tgz#08b3976bdd21c38bc076693d95834f97539f3b15"
+  integrity sha512-lWlXJanBdHQ18jW/yphedRokHcvZD1GdGzUF/wQxKDsHwDDfO45ZkAxuSBI202dG+r1Ph483Z3pFykO2obeSRA==
   dependencies:
     "@babel/runtime" "^7.4.4"
-    "@emotion/hash" "^0.7.4"
-    "@material-ui/types" "^5.0.0"
-    "@material-ui/utils" "^4.7.1"
-    clsx "^1.0.2"
+    "@emotion/hash" "^0.8.0"
+    "@material-ui/types" "^5.0.1"
+=======
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+"@material-ui/styles@^4.9.14":
+  version "4.9.14"
+  resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.9.14.tgz#0a9e93a2bf24e8daa0811411a6f3dabdafbe9a07"
+  integrity sha512-zecwWKgRU2VzdmutNovPB4s5LKI0TWyZKc/AHfPu9iY8tg4UoLjpa4Rn9roYrRfuTbBZHI6b0BXcQ8zkis0nzQ==
+  dependencies:
+    "@babel/runtime" "^7.4.4"
+    "@emotion/hash" "^0.8.0"
+    "@material-ui/types" "^5.1.0"
+<<<<<<< HEAD
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+    "@material-ui/utils" "^4.9.6"
+    clsx "^1.0.4"
     csstype "^2.5.2"
-    hoist-non-react-statics "^3.2.1"
+    hoist-non-react-statics "^3.3.2"
     jss "^10.0.3"
     jss-plugin-camel-case "^10.0.3"
     jss-plugin-default-unit "^10.0.3"
@@ -1207,24 +1404,47 @@
     jss-plugin-vendor-prefixer "^10.0.3"
     prop-types "^15.7.2"
 
-"@material-ui/system@^4.9.3":
-  version "4.9.3"
-  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.3.tgz#ee48990d7941237fdaf21b7b399981d614bb0875"
-  integrity sha512-DBGsTKYrLlFpHG8BUp0X6ZpvaOzef+GhSwn/8DwVTXUdHitphaPQoL9xucrI8X9MTBo//El+7nylko7lo7eJIw==
+<<<<<<< HEAD
+<<<<<<< HEAD
+"@material-ui/system@^4.9.13":
+  version "4.9.13"
+  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.13.tgz#adefb3b6a5ddf0b00fe4e82ac63bb48276e9749d"
+  integrity sha512-6AlpvdW6KJJ5bF1Xo2OD13sCN8k+nlL36412/bWnWZOKIfIMo/Lb8c8d1DOIaT/RKWxTEUaWnKZjabVnA3eZjA==
   dependencies:
     "@babel/runtime" "^7.4.4"
-    "@material-ui/utils" "^4.7.1"
+    "@material-ui/utils" "^4.9.6"
     prop-types "^15.7.2"
 
-"@material-ui/types@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.0.0.tgz#26d6259dc6b39f4c2e1e9aceff7a11e031941741"
-  integrity sha512-UeH2BuKkwDndtMSS0qgx1kCzSMw+ydtj0xx/XbFtxNSTlXydKwzs5gVW5ZKsFlAkwoOOQ9TIsyoCC8hq18tOwg==
+"@material-ui/types@^5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.0.1.tgz#c4954063cdc196eb327ee62c041368b1aebb6d61"
+  integrity sha512-wURPSY7/3+MAtng3i26g+WKwwNE3HEeqa/trDBR5+zWKmcjO+u9t7Npu/J1r+3dmIa/OeziN9D/18IrBKvKffw==
+=======
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+"@material-ui/system@^4.9.14":
+  version "4.9.14"
+  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.14.tgz#4b00c48b569340cefb2036d0596b93ac6c587a5f"
+  integrity sha512-oQbaqfSnNlEkXEziDcJDDIy8pbvwUmZXWNqlmIwDqr/ZdCK8FuV3f4nxikUh7hvClKV2gnQ9djh5CZFTHkZj3w==
+  dependencies:
+    "@babel/runtime" "^7.4.4"
+    "@material-ui/utils" "^4.9.6"
+    csstype "^2.5.2"
+    prop-types "^15.7.2"
 
-"@material-ui/utils@^4.7.1":
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.7.1.tgz#dc16c7f0d2cd02fbcdd5cfe601fd6863ae3cc652"
-  integrity sha512-+ux0SlLdlehvzCk2zdQ3KiS3/ylWvuo/JwAGhvb8dFVvwR21K28z0PU9OQW2PGogrMEdvX3miEI5tGxTwwWiwQ==
+"@material-ui/types@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz#efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2"
+  integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==
+<<<<<<< HEAD
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+
+"@material-ui/utils@^4.9.12", "@material-ui/utils@^4.9.6":
+  version "4.9.12"
+  resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.9.12.tgz#0d639f1c1ed83fffb2ae10c21d15a938795d9e65"
+  integrity sha512-/0rgZPEOcZq5CFA4+4n6Q6zk7fi8skHhH2Bcra8R3epoJEYy5PL55LuMazPtPH1oKeRausDV/Omz4BbgFsn1HQ==
   dependencies:
     "@babel/runtime" "^7.4.4"
     prop-types "^15.7.2"
@@ -1252,9 +1472,14 @@
     prop-types "^15.6.2"
 
 "@sheerun/mutationobserver-shim@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.2.tgz#8013f2af54a2b7d735f71560ff360d3a8176a87b"
-  integrity sha512-vTCdPp/T/Q3oSqwHmZ5Kpa9oI7iLtGl3RQaA/NyLHikvcrPxACkkKVr/XzkSPJWXHRhKGzVvb0urJsbMlRxi1Q==
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz#5405ee8e444ed212db44e79351f0c70a582aae25"
+  integrity sha512-DetpxZw1fzPD5xUBrIAoplLChO2VB8DlL5Gg+I1IR9b2wPqYIca2WSUxL5g1vLeR4MsQq1NeWriXAVffV+U1Fw==
+
+"@sindresorhus/is@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
+  integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
 
 "@stardust-ui/react-component-event-listener@~0.38.0":
   version "0.38.0"
@@ -1376,17 +1601,18 @@
     "@svgr/plugin-svgo" "^4.3.1"
     loader-utils "^1.2.3"
 
-"@testing-library/dom@^6.11.0":
-  version "6.12.2"
-  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-6.12.2.tgz#5d549acf43f2e0c23b2abfd4e36d65594c3b2741"
-  integrity sha512-KCnvHra5fV+wDxg3wJObGvZFxq7v1DJt829GNFLuRDjKxVNc/B5AdsylNF5PMHFbWMXDsHwM26d2NZcZO9KjbQ==
+"@testing-library/dom@^6.15.0":
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-6.16.0.tgz#04ada27ed74ad4c0f0d984a1245bb29b1fd90ba9"
+  integrity sha512-lBD88ssxqEfz0wFL6MeUyyWZfV/2cjEZZV3YRpb2IoJRej/4f1jB0TzqIOznTpfR1r34CNesrubxwIlAQ8zgPA==
   dependencies:
-    "@babel/runtime" "^7.6.2"
+    "@babel/runtime" "^7.8.4"
     "@sheerun/mutationobserver-shim" "^0.3.2"
-    "@types/testing-library__dom" "^6.0.0"
-    aria-query "3.0.0"
-    pretty-format "^24.9.0"
-    wait-for-expect "^3.0.0"
+    "@types/testing-library__dom" "^6.12.1"
+    aria-query "^4.0.2"
+    dom-accessibility-api "^0.3.0"
+    pretty-format "^25.1.0"
+    wait-for-expect "^3.0.2"
 
 "@testing-library/jest-dom@^4.2.4":
   version "4.2.4"
@@ -1404,12 +1630,12 @@
     redent "^3.0.0"
 
 "@testing-library/react@^9.3.2":
-  version "9.4.1"
-  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-9.4.1.tgz#955771568aa3216107d307bfdf470bf2394308a0"
-  integrity sha512-sta3ui24HPgW92quHyQj6gpOkNgLNx8BX/QOU4k1bddo43ZdqlGwmzCYwL93bExfhergwiau+IzBGl7TCsSFeA==
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-9.5.0.tgz#71531655a7890b61e77a1b39452fbedf0472ca5e"
+  integrity sha512-di1b+D0p+rfeboHO5W7gTVeZDIK5+maEgstrZbWZSSvxDyfDRkkyBE1AJR5Psd6doNldluXlCWqXriUfqu/9Qg==
   dependencies:
-    "@babel/runtime" "^7.8.3"
-    "@testing-library/dom" "^6.11.0"
+    "@babel/runtime" "^7.8.4"
+    "@testing-library/dom" "^6.15.0"
     "@types/testing-library__react" "^9.1.2"
 
 "@testing-library/user-event@^7.1.2":
@@ -1418,9 +1644,9 @@
   integrity sha512-oZ0Ib5I4Z2pUEcoo95cT1cr6slco9WY7yiPpG+RGNkj8YcYgJnM7pXmYmorNOReh8MIGcKSqXyeGjxnr8YiZbA==
 
 "@types/babel__core@^7.1.0":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.3.tgz#e441ea7df63cd080dfcd02ab199e6d16a735fc30"
-  integrity sha512-8fBo0UR2CcwWxeX7WIIgJ7lXjasFxoYgRnFHUj+hRvKkpiBJbxhdAPTCY6/ZKM0uxANFVzt4yObSLuTiTnazDA==
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89"
+  integrity sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -1444,12 +1670,17 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.0.8"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.8.tgz#479a4ee3e291a403a1096106013ec22cf9b64012"
-  integrity sha512-yGeB2dHEdvxjP0y4UbRtQaSkXJ9649fYCmIdRoul5kfAoGCwxuCbMhag0k3RPfnuh9kPGm8x89btcfDEXdVWGw==
+  version "7.0.11"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.11.tgz#1ae3010e8bf8851d324878b42acec71986486d18"
+  integrity sha512-ddHK5icION5U6q11+tV2f9Mo6CZVuT8GJKld2q9LqHSZbvLbH34Kcu2yFGckZut453+eQU6btIA3RihmnRgI+Q==
   dependencies:
     "@babel/types" "^7.3.0"
 
+"@types/color-name@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+
 "@types/eslint-visitor-keys@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
@@ -1470,9 +1701,28 @@
     "@types/node" "*"
 
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
   integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
+=======
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz#79d7a78bad4219f4c03d6557a1c72d9ca6ba62d5"
+  integrity sha512-rsZg7eL+Xcxsxk2XlBt9KcG8nOp9iYdKCOikY9x2RFJCyOdNj4MKPQty0e8oZr29vVAzKXr1BmR+kZauti3o1w==
+<<<<<<< HEAD
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz#79d7a78bad4219f4c03d6557a1c72d9ca6ba62d5"
+  integrity sha512-rsZg7eL+Xcxsxk2XlBt9KcG8nOp9iYdKCOikY9x2RFJCyOdNj4MKPQty0e8oZr29vVAzKXr1BmR+kZauti3o1w==
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+=======
+>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
 
 "@types/istanbul-lib-report@*":
   version "3.0.0"
@@ -1482,9 +1732,28 @@
     "@types/istanbul-lib-coverage" "*"
 
 "@types/istanbul-reports@^1.1.1":
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a"
   integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==
+=======
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz#e875cc689e47bce549ec81f3df5e6f6f11cfaeb2"
+  integrity sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==
+<<<<<<< HEAD
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz#e875cc689e47bce549ec81f3df5e6f6f11cfaeb2"
+  integrity sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+=======
+>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
   dependencies:
     "@types/istanbul-lib-coverage" "*"
     "@types/istanbul-lib-report" "*"
@@ -1500,9 +1769,31 @@
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/node@*":
-  version "13.5.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.5.3.tgz#37f1f539b7535b9fb4ef77d59db1847a837b7f17"
-  integrity sha512-ZPnWX9PW992w6DUsz3JIXHaSb5v7qmKCVzC3km6SxcDGxk7zmLfYaCJTbktIa5NeywJkkZDhGldKqDIvC5DRrA==
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
+  version "13.13.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.5.tgz#96ec3b0afafd64a4ccea9107b75bf8489f0e5765"
+  integrity sha512-3ySmiBYJPqgjiHA7oEaIo2Rzz0HrOZ7yrNO5HWyaE5q0lQ3BppDZ3N53Miz8bw2I7gh1/zir2MGVZBvpb1zq9g==
+=======
+<<<<<<< HEAD
+  version "14.0.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.1.tgz#5d93e0a099cd0acd5ef3d5bde3c086e1f49ff68c"
+  integrity sha512-FAYBGwC+W6F9+huFIDtn43cpy7+SzG+atzRiTfdp3inUKL2hXnd4rG8hylJLIh4+hqrQy1P17kvJByE/z825hA==
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+  version "14.0.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.1.tgz#5d93e0a099cd0acd5ef3d5bde3c086e1f49ff68c"
+  integrity sha512-FAYBGwC+W6F9+huFIDtn43cpy7+SzG+atzRiTfdp3inUKL2hXnd4rG8hylJLIh4+hqrQy1P17kvJByE/z825hA==
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+=======
+  version "14.0.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.1.tgz#5d93e0a099cd0acd5ef3d5bde3c086e1f49ff68c"
+  integrity sha512-FAYBGwC+W6F9+huFIDtn43cpy7+SzG+atzRiTfdp3inUKL2hXnd4rG8hylJLIh4+hqrQy1P17kvJByE/z825hA==
+>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
@@ -1520,9 +1811,21 @@
   integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
 
 "@types/react-dom@*":
-  version "16.9.5"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.5.tgz#5de610b04a35d07ffd8f44edad93a71032d9aaa7"
-  integrity sha512-BX6RQ8s9D+2/gDhxrj8OW+YD4R+8hj7FEM/OJHGNR0KipE1h1mSsf39YeyC81qafkq+N3rU3h3RFbLSwE5VqUg==
+<<<<<<< HEAD
+<<<<<<< HEAD
+  version "16.9.7"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.7.tgz#60844d48ce252d7b2dccf0c7bb937130e27c0cd2"
+  integrity sha512-GHTYhM8/OwUCf254WO5xqR/aqD3gC9kSTLpopWGpQLpnw23jk44RvMHsyUSEplvRJZdHxhJGMMLF0kCPYHPhQA==
+=======
+  version "16.9.8"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz#fe4c1e11dfc67155733dfa6aa65108b4971cb423"
+  integrity sha512-ykkPQ+5nFknnlU6lDd947WbQ6TE3NNzbQAkInC2EKY1qeYdTKp7onFusmYZb+ityzx2YviqT6BXSu+LyWWJwcA==
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+  version "16.9.8"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz#fe4c1e11dfc67155733dfa6aa65108b4971cb423"
+  integrity sha512-ykkPQ+5nFknnlU6lDd947WbQ6TE3NNzbQAkInC2EKY1qeYdTKp7onFusmYZb+ityzx2YviqT6BXSu+LyWWJwcA==
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
   dependencies:
     "@types/react" "*"
 
@@ -1534,9 +1837,21 @@
     "@types/react" "*"
 
 "@types/react@*":
-  version "16.9.22"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.22.tgz#f0288c92d94e93c4b43e3f5633edf788b2c040ae"
-  integrity sha512-7OSt4EGiLvy0h5R7X+r0c7S739TCU/LvWbkNOrm10lUwNHe7XPz5OLhLOSZeCkqO9JSCly1NkYJ7ODTUqVnHJQ==
+<<<<<<< HEAD
+<<<<<<< HEAD
+  version "16.9.34"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.34.tgz#f7d5e331c468f53affed17a8a4d488cd44ea9349"
+  integrity sha512-8AJlYMOfPe1KGLKyHpflCg5z46n0b5DbRfqDksxBLBTUpB75ypDBAO9eCUcjNwE6LCUslwTz00yyG/X9gaVtow==
+=======
+  version "16.9.35"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.35.tgz#a0830d172e8aadd9bd41709ba2281a3124bbd368"
+  integrity sha512-q0n0SsWcGc8nDqH2GJfWQWUOmZSJhXV64CjVN5SvcNti3TdEaA3AH0D8DwNmMdzjMAC/78tB8nAZIlV8yTz+zQ==
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+  version "16.9.35"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.35.tgz#a0830d172e8aadd9bd41709ba2281a3124bbd368"
+  integrity sha512-q0n0SsWcGc8nDqH2GJfWQWUOmZSJhXV64CjVN5SvcNti3TdEaA3AH0D8DwNmMdzjMAC/78tB8nAZIlV8yTz+zQ==
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
   dependencies:
     "@types/prop-types" "*"
     csstype "^2.2.0"
@@ -1546,20 +1861,28 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
   integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
 
-"@types/testing-library__dom@*", "@types/testing-library__dom@^6.0.0":
-  version "6.12.1"
-  resolved "https://registry.yarnpkg.com/@types/testing-library__dom/-/testing-library__dom-6.12.1.tgz#37af28fae051f9e3feed5684535b1540c97ae28b"
-  integrity sha512-cgqnEjxKk31tQt29j4baSWaZPNjQf3bHalj2gcHQTpW5SuHRal76gOpF0vypeEo6o+sS5inOvvNdzLY0B3FB2A==
+"@types/testing-library__dom@*":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@types/testing-library__dom/-/testing-library__dom-7.0.2.tgz#2906f8a0dce58b0746c6ab606f786bd06fe6940e"
+  integrity sha512-8yu1gSwUEAwzg2OlPNbGq+ixhmSviGurBu1+ivxRKq1eRcwdjkmlwtPvr9VhuxTq2fNHBWN2po6Iem3Xt5A6rg==
+  dependencies:
+    pretty-format "^25.1.0"
+
+"@types/testing-library__dom@^6.12.1":
+  version "6.14.0"
+  resolved "https://registry.yarnpkg.com/@types/testing-library__dom/-/testing-library__dom-6.14.0.tgz#1aede831cb4ed4a398448df5a2c54b54a365644e"
+  integrity sha512-sMl7OSv0AvMOqn1UJ6j1unPMIHRXen0Ita1ujnMX912rrOcawe4f7wu0Zt9GIQhBhJvH2BaibqFgQ3lP+Pj2hA==
   dependencies:
     pretty-format "^24.3.0"
 
 "@types/testing-library__react@^9.1.2":
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/@types/testing-library__react/-/testing-library__react-9.1.2.tgz#e33af9124c60a010fc03a34eff8f8a34a75c4351"
-  integrity sha512-CYaMqrswQ+cJACy268jsLAw355DZtPZGt3Jwmmotlcu8O/tkoXBI6AeZ84oZBJsIsesozPKzWzmv/0TIU+1E9Q==
+  version "9.1.3"
+  resolved "https://registry.yarnpkg.com/@types/testing-library__react/-/testing-library__react-9.1.3.tgz#35eca61cc6ea923543796f16034882a1603d7302"
+  integrity sha512-iCdNPKU3IsYwRK9JieSYAiX0+aYDXOGAmrC/3/M7AqqSDKnWWVv07X+Zk1uFSL7cMTUYzv4lQRfohucEocn5/w==
   dependencies:
     "@types/react-dom" "*"
     "@types/testing-library__dom" "*"
+    pretty-format "^25.1.0"
 
 "@types/yargs-parser@*":
   version "15.0.0"
@@ -1567,53 +1890,203 @@
   integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
 
 "@types/yargs@^13.0.0":
-  version "13.0.7"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.7.tgz#658d8578a444670a41cc9c338d5e0e0a9910fd9e"
-  integrity sha512-Sg9kNeJz+V+W+0fugcVhHC+mNHnydDR1RJrW5Qn2jVrDQARF8wfPVqIqwEzZp+bneuEBIm2ClsJ1/je42ZBzSg==
+<<<<<<< HEAD
+<<<<<<< HEAD
+  version "13.0.8"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.8.tgz#a38c22def2f1c2068f8971acb3ea734eb3c64a99"
+  integrity sha512-XAvHLwG7UQ+8M4caKIH0ZozIOYay5fQkAgyIXegXT9jPtdIGdhga+sUEdAr1CiG46aB+c64xQEYyEzlwWVTNzA==
+=======
+  version "13.0.9"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.9.tgz#44028e974343c7afcf3960f1a2b1099c39a7b5e1"
+  integrity sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+  version "13.0.9"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.9.tgz#44028e974343c7afcf3960f1a2b1099c39a7b5e1"
+  integrity sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+  dependencies:
+    "@types/yargs-parser" "*"
+
+"@types/yargs@^15.0.0":
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
+  version "15.0.4"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.4.tgz#7e5d0f8ca25e9d5849f2ea443cf7c402decd8299"
+  integrity sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==
+=======
+<<<<<<< HEAD
+  version "15.0.5"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz#947e9a6561483bdee9adffc983e91a6902af8b79"
+  integrity sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+  version "15.0.5"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz#947e9a6561483bdee9adffc983e91a6902af8b79"
+  integrity sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+=======
+  version "15.0.5"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz#947e9a6561483bdee9adffc983e91a6902af8b79"
+  integrity sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==
+>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
   dependencies:
     "@types/yargs-parser" "*"
 
 "@typescript-eslint/eslint-plugin@^2.10.0":
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.18.0.tgz#f8cf272dfb057ecf1ea000fea1e0b3f06a32f9cb"
-  integrity sha512-kuO8WQjV+RCZvAXVRJfXWiJ8iYEtfHlKgcqqqXg9uUkIolEHuUaMmm8/lcO4xwCOtaw6mY0gStn2Lg4/eUXXYQ==
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+  version "2.31.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.31.0.tgz#942c921fec5e200b79593c71fafb1e3f57aa2e36"
+  integrity sha512-iIC0Pb8qDaoit+m80Ln/aaeu9zKQdOLF4SHcGLarSeY1gurW6aU4JsOPMjKQwXlw70MvWKZQc6S2NamA8SJ/gg==
   dependencies:
-    "@typescript-eslint/experimental-utils" "2.18.0"
-    eslint-utils "^1.4.3"
+    "@typescript-eslint/experimental-utils" "2.31.0"
+=======
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+=======
+  version "2.32.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.32.0.tgz#5d5cc2e00b1d4a4b848cc68bfdd3aede1ef0ad16"
+  integrity sha512-nb1kSUa8cd22hGgxpGdVT6/iyP7IKyrnyZEGYo+tN8iyDdXvXa+nfsX03tJVeFfhbkwR/0CDk910zPbqSflAsg==
+  dependencies:
+    "@typescript-eslint/experimental-utils" "2.32.0"
+=======
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
+  version "2.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.33.0.tgz#d6c8319d5011b4783bb3d2dadf105d8bdd499bd5"
+  integrity sha512-QV6P32Btu1sCI/kTqjTNI/8OpCYyvlGjW5vD8MpTIg+HGE5S88HtT1G+880M4bXlvXj/NjsJJG0aGcVh0DdbeQ==
+  dependencies:
+    "@typescript-eslint/experimental-utils" "2.33.0"
+<<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+=======
+>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
     functional-red-black-tree "^1.0.1"
     regexpp "^3.0.0"
     tsutils "^3.17.1"
 
-"@typescript-eslint/experimental-utils@2.18.0":
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.18.0.tgz#e4eab839082030282496c1439bbf9fdf2a4f3da8"
-  integrity sha512-J6MopKPHuJYmQUkANLip7g9I82ZLe1naCbxZZW3O2sIxTiq/9YYoOELEKY7oPg0hJ0V/AQ225h2z0Yp+RRMXhw==
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+"@typescript-eslint/experimental-utils@2.31.0":
+  version "2.31.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.31.0.tgz#a9ec514bf7fd5e5e82bc10dcb6a86d58baae9508"
+  integrity sha512-MI6IWkutLYQYTQgZ48IVnRXmLR/0Q6oAyJgiOror74arUMh7EWjJkADfirZhRsUMHeLJ85U2iySDwHTSnNi9vA==
   dependencies:
     "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "2.18.0"
+    "@typescript-eslint/typescript-estree" "2.31.0"
+=======
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+=======
+"@typescript-eslint/experimental-utils@2.32.0":
+  version "2.32.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.32.0.tgz#bee7fbe1d21d13a273066d70abc82549d0b7943e"
+  integrity sha512-oDWuB2q5AXsQ/mLq2N4qtWiBASWXPf7KhqXgeGH4QsyVKx+km8F6Vfqd3bspJQyhyCqxcbLO/jKJuIV3DzHZ6A==
+  dependencies:
+    "@types/json-schema" "^7.0.3"
+    "@typescript-eslint/typescript-estree" "2.32.0"
+=======
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
+"@typescript-eslint/experimental-utils@2.33.0":
+  version "2.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.33.0.tgz#000f1e5f344fbea1323dc91cc174805d75f99a03"
+  integrity sha512-qzPM2AuxtMrRq78LwyZa8Qn6gcY8obkIrBs1ehqmQADwkYzTE1Pb4y2W+U3rE/iFkSWcWHG2LS6MJfj6SmHApg==
+  dependencies:
+    "@types/json-schema" "^7.0.3"
+    "@typescript-eslint/typescript-estree" "2.33.0"
+<<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+=======
+>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
     eslint-scope "^5.0.0"
+    eslint-utils "^2.0.0"
 
 "@typescript-eslint/parser@^2.10.0":
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.18.0.tgz#d5f7fc1839abd4a985394e40e9d2454bd56aeb1f"
-  integrity sha512-SJJPxFMEYEWkM6pGfcnjLU+NJIPo+Ko1QrCBL+i0+zV30ggLD90huEmMMhKLHBpESWy9lVEeWlQibweNQzyc+A==
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+  version "2.31.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.31.0.tgz#beddd4e8efe64995108b229b2862cd5752d40d6f"
+  integrity sha512-uph+w6xUOlyV2DLSC6o+fBDzZ5i7+3/TxAsH4h3eC64tlga57oMb96vVlXoMwjR/nN+xyWlsnxtbDkB46M2EPQ==
   dependencies:
     "@types/eslint-visitor-keys" "^1.0.0"
-    "@typescript-eslint/experimental-utils" "2.18.0"
-    "@typescript-eslint/typescript-estree" "2.18.0"
+    "@typescript-eslint/experimental-utils" "2.31.0"
+    "@typescript-eslint/typescript-estree" "2.31.0"
     eslint-visitor-keys "^1.1.0"
 
-"@typescript-eslint/typescript-estree@2.18.0":
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.18.0.tgz#cfbd16ed1b111166617d718619c19b62764c8460"
-  integrity sha512-gVHylf7FDb8VSi2ypFuEL3hOtoC4HkZZ5dOjXvVjoyKdRrvXAOPSzpNRnKMfaUUEiSLP8UF9j9X9EDLxC0lfZg==
+"@typescript-eslint/typescript-estree@2.31.0":
+  version "2.31.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.31.0.tgz#ac536c2d46672aa1f27ba0ec2140d53670635cfd"
+  integrity sha512-vxW149bXFXXuBrAak0eKHOzbcu9cvi6iNcJDzEtOkRwGHxJG15chiAQAwhLOsk+86p9GTr/TziYvw+H9kMaIgA==
+=======
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+=======
+  version "2.32.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.32.0.tgz#a1ace8ab1af529580bfb6cc2cd55fd8d8b1e68ab"
+  integrity sha512-swRtH835fUfm2khchiOVNchU3gVNaZNj2pY92QSx4kXan+RzaGNrwIRaCyX8uqzmK0xNPzseaUYHP8CsmrsjFw==
+  dependencies:
+    "@types/eslint-visitor-keys" "^1.0.0"
+    "@typescript-eslint/experimental-utils" "2.32.0"
+    "@typescript-eslint/typescript-estree" "2.32.0"
+    eslint-visitor-keys "^1.1.0"
+
+"@typescript-eslint/typescript-estree@2.32.0":
+  version "2.32.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.32.0.tgz#0e4ae2e883557f94039b13ac0ecfcfbb09835b8d"
+  integrity sha512-hQpbWM/Y2iq6jB9FHYJBqa3h1R9IEGodOtajhb261cVHt9cz30AKjXM6WP7LxJdEPPlyJ9rPTZVgBUgZgiyPgw==
+=======
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
+  version "2.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.33.0.tgz#395c0ef229ebef883608f8632a34f0acf02b9bdd"
+  integrity sha512-AUtmwUUhJoH6yrtxZMHbRUEMsC2G6z5NSxg9KsROOGqNXasM71I8P2NihtumlWTUCRld70vqIZ6Pm4E5PAziEA==
+  dependencies:
+    "@types/eslint-visitor-keys" "^1.0.0"
+    "@typescript-eslint/experimental-utils" "2.33.0"
+    "@typescript-eslint/typescript-estree" "2.33.0"
+    eslint-visitor-keys "^1.1.0"
+
+"@typescript-eslint/typescript-estree@2.33.0":
+  version "2.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.33.0.tgz#33504c050ccafd38f397a645d4e9534d2eccbb5c"
+  integrity sha512-d8rY6/yUxb0+mEwTShCQF2zYQdLlqihukNfG9IUlLYz5y1CH6G/9XYbrxQLq3Z14RNvkCC6oe+OcFlyUpwUbkg==
+<<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+=======
+>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
   dependencies:
     debug "^4.1.1"
     eslint-visitor-keys "^1.1.0"
     glob "^7.1.6"
     is-glob "^4.0.1"
     lodash "^4.17.15"
+<<<<<<< HEAD
+<<<<<<< HEAD
     semver "^6.3.0"
+=======
+    semver "^7.3.2"
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+    semver "^7.3.2"
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
     tsutils "^3.17.1"
 
 "@webassemblyjs/ast@1.8.5":
@@ -1793,10 +2266,10 @@ acorn-globals@^4.1.0, acorn-globals@^4.3.0:
     acorn "^6.0.1"
     acorn-walk "^6.0.1"
 
-acorn-jsx@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384"
-  integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==
+acorn-jsx@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
+  integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
 
 acorn-walk@^6.0.1:
   version "6.2.0"
@@ -1804,19 +2277,38 @@ acorn-walk@^6.0.1:
   integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
 
 acorn@^5.5.3:
-  version "5.7.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
-  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
+  version "5.7.4"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
+  integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
 
 acorn@^6.0.1, acorn@^6.0.4, acorn@^6.2.1:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"
-  integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
+  integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
 
-acorn@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"
-  integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==
+acorn@^7.1.1:
+<<<<<<< HEAD
+<<<<<<< HEAD
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
+  integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==
+=======
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.2.0.tgz#17ea7e40d7c8640ff54a694c889c26f31704effe"
+  integrity sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.2.0.tgz#17ea7e40d7c8640ff54a694c889c26f31704effe"
+  integrity sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==
+
+add-dom-event-listener@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz#6a92db3a0dd0abc254e095c0f1dc14acbbaae310"
+  integrity sha512-WCxx1ixHT0GQU9hb0KI/mhgRQhnU+U3GvwY6ZvVjYq8rsihIGoaIOUbY0yMPBxLH5MDtr0kz3fisWGNcbWW7Jw==
+  dependencies:
+    object-assign "4.x"
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
 
 address@1.1.2, address@^1.0.1:
   version "1.1.2"
@@ -1852,10 +2344,10 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
   integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5:
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz#c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"
-  integrity sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.5.5:
+  version "6.12.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
+  integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -1878,11 +2370,18 @@ ansi-escapes@^3.0.0:
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
 ansi-escapes@^4.2.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.0.tgz#a4ce2b33d6b214b7950d8595c212f12ac9cc569d"
-  integrity sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
+  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
   dependencies:
-    type-fest "^0.8.1"
+    type-fest "^0.11.0"
+
+ansi-gray@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
+  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
+  dependencies:
+    ansi-wrap "0.1.0"
 
 ansi-html@0.0.7:
   version "0.0.7"
@@ -1921,6 +2420,19 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
+  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
+  dependencies:
+    "@types/color-name" "^1.1.1"
+    color-convert "^2.0.1"
+
+ansi-wrap@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
+  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
+
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -1942,6 +2454,13 @@ aproba@^1.1.1:
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
+archive-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/archive-type/-/archive-type-4.0.0.tgz#f92e72233056dfc6969472749c267bdb046b1d70"
+  integrity sha1-+S5yIzBW38aWlHJ0nCZ72wRrHXA=
+  dependencies:
+    file-type "^4.2.0"
+
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -1949,7 +2468,7 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
-aria-query@3.0.0, aria-query@^3.0.0:
+aria-query@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-3.0.0.tgz#65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc"
   integrity sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=
@@ -1957,6 +2476,14 @@ aria-query@3.0.0, aria-query@^3.0.0:
     ast-types-flow "0.0.7"
     commander "^2.11.0"
 
+aria-query@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.0.2.tgz#250687b4ccde1ab86d127da0432ae3552fc7b145"
+  integrity sha512-S1G1V790fTaigUSM/Gd0NngzEfiMy9uTUfMyHhKhVyy4cH5O/eTuR01ydhGL0z4Za1PXFTRGH3qL8VhUQuEO5w==
+  dependencies:
+    "@babel/runtime" "^7.7.4"
+    "@babel/runtime-corejs3" "^7.7.4"
+
 arity-n@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/arity-n/-/arity-n-1.0.4.tgz#d9e76b11733e08569c0847ae7b39b2860b30b745"
@@ -2115,17 +2642,17 @@ atob@^2.1.2:
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@^9.6.1:
-  version "9.7.4"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.4.tgz#f8bf3e06707d047f0641d87aee8cfb174b2a5378"
-  integrity sha512-g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g==
+  version "9.7.6"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.6.tgz#63ac5bbc0ce7934e6997207d5bb00d68fa8293a4"
+  integrity sha512-F7cYpbN7uVVhACZTeeIeealwdGM6wMtfWARVLTy5xmKtgVdBNJvbDRoCK3YO1orcs7gv/KwYlb3iXwu9Ug9BkQ==
   dependencies:
-    browserslist "^4.8.3"
-    caniuse-lite "^1.0.30001020"
+    browserslist "^4.11.1"
+    caniuse-lite "^1.0.30001039"
     chalk "^2.4.2"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.26"
-    postcss-value-parser "^4.0.2"
+    postcss "^7.0.27"
+    postcss-value-parser "^4.0.3"
 
 aws-sign2@~0.7.0:
   version "0.7.0"
@@ -2145,12 +2672,9 @@ axios@^0.19.2:
     follow-redirects "1.5.10"
 
 axobject-query@^2.0.2:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.1.tgz#2a3b1271ec722d48a4cd4b3fcc20c853326a49a7"
-  integrity sha512-lF98xa/yvy6j3fBHAgQXIYl+J4eZadOSqsPojemUqClzNbBV38wWGpUbQbVEyf4eUF5yF7eHmGgGA2JiHyjeqw==
-  dependencies:
-    "@babel/runtime" "^7.7.4"
-    "@babel/runtime-corejs3" "^7.7.4"
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.2.tgz#2bdffc0371e643e5f03ba99065d5179b9ca79799"
+  integrity sha512-ICt34ZmrVt8UQnvPl6TVyDTkmhXmAyAT4Jh5ugfGUX4MOrZ+U/ZY6/sdylRw3qGNr9Ub5AJsaHeDMzNLehRdOQ==
 
 babel-code-frame@^6.22.0:
   version "6.26.0"
@@ -2203,10 +2727,10 @@ babel-loader@8.0.6:
     mkdirp "^0.5.1"
     pify "^4.0.1"
 
-babel-plugin-dynamic-import-node@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"
-  integrity sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==
+babel-plugin-dynamic-import-node@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
+  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
   dependencies:
     object.assign "^4.1.0"
 
@@ -2283,25 +2807,27 @@ babel-preset-jest@^24.9.0:
     babel-plugin-jest-hoist "^24.9.0"
 
 babel-preset-react-app@^9.1.1:
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.1.1.tgz#d1ceb47cbe48b285fdd5c562c54c432ed5a41e0e"
-  integrity sha512-YkWP2UwY//TLltNlEBRngDOrYhvSLb+CA330G7T9M5UhGEMWe+JK/8IXJc5p2fDTSfSiETf+PY0+PYXFMix81Q==
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.1.2.tgz#54775d976588a8a6d1a99201a702befecaf48030"
+  integrity sha512-k58RtQOKH21NyKtzptoAvtAODuAJJs3ZhqBMl456/GnXEQ/0La92pNmwgWoMn5pBTrsvk3YYXdY7zpY4e3UIxA==
   dependencies:
-    "@babel/core" "7.8.4"
+    "@babel/core" "7.9.0"
     "@babel/plugin-proposal-class-properties" "7.8.3"
     "@babel/plugin-proposal-decorators" "7.8.3"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "7.8.3"
     "@babel/plugin-proposal-numeric-separator" "7.8.3"
-    "@babel/plugin-transform-flow-strip-types" "7.8.3"
+    "@babel/plugin-proposal-optional-chaining" "7.9.0"
+    "@babel/plugin-transform-flow-strip-types" "7.9.0"
     "@babel/plugin-transform-react-display-name" "7.8.3"
-    "@babel/plugin-transform-runtime" "7.8.3"
-    "@babel/preset-env" "7.8.4"
-    "@babel/preset-react" "7.8.3"
-    "@babel/preset-typescript" "7.8.3"
-    "@babel/runtime" "7.8.4"
+    "@babel/plugin-transform-runtime" "7.9.0"
+    "@babel/preset-env" "7.9.0"
+    "@babel/preset-react" "7.9.1"
+    "@babel/preset-typescript" "7.9.0"
+    "@babel/runtime" "7.9.0"
     babel-plugin-macros "2.8.0"
     babel-plugin-transform-react-remove-prop-types "0.4.24"
 
-babel-runtime@^6.26.0:
+babel-runtime@6.x, babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
   integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
@@ -2371,16 +2897,29 @@ bindings@^1.5.0:
   dependencies:
     file-uri-to-path "1.0.0"
 
+bl@^1.0.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
+  integrity sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==
+  dependencies:
+    readable-stream "^2.3.5"
+    safe-buffer "^5.1.1"
+
 bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
   integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
 
+bn.js@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.1.tgz#48efc4031a9c4041b9c99c6941d903463ab62eb5"
+  integrity sha512-IUTD/REb78Z2eodka1QZyyEk66pciRcP6Sroka0aI3tG/iwIdYLrBD62RsubR7vqdt3WyX8p4jxeatzmRSphtA==
+
 body-parser@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
@@ -2450,10 +2989,10 @@ brorand@^1.0.1:
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
-browser-process-hrtime@^0.1.2:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"
-  integrity sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==
+browser-process-hrtime@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
+  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
 browser-resolve@^1.11.3:
   version "1.11.3"
@@ -2493,7 +3032,7 @@ browserify-des@^1.0.0:
     inherits "^2.0.1"
     safe-buffer "^5.1.2"
 
-browserify-rsa@^4.0.0:
+browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
   integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
@@ -2502,17 +3041,18 @@ browserify-rsa@^4.0.0:
     randombytes "^2.0.1"
 
 browserify-sign@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
-  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.1.0.tgz#4fe971b379a5aeb4925e06779f9fa1f41d249d70"
+  integrity sha512-VYxo7cDCeYUoBZ0ZCy4UyEUCP3smyBd4DRQM5nrFS1jJjPJjX7rP3oLRpPoWfkhQfyJ0I9ZbHbKafrFD/SGlrg==
   dependencies:
-    bn.js "^4.1.1"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.2"
-    elliptic "^6.0.0"
-    inherits "^2.0.1"
-    parse-asn1 "^5.0.0"
+    bn.js "^5.1.1"
+    browserify-rsa "^4.0.1"
+    create-hash "^1.2.0"
+    create-hmac "^1.1.7"
+    elliptic "^6.5.2"
+    inherits "^2.0.4"
+    parse-asn1 "^5.1.5"
+    readable-stream "^3.6.0"
 
 browserify-zlib@^0.2.0:
   version "0.2.0"
@@ -2521,14 +3061,25 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@4.8.6, browserslist@^4.0.0, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.8.3, browserslist@^4.8.5:
-  version "4.8.6"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.6.tgz#96406f3f5f0755d272e27a66f4163ca821590a7e"
-  integrity sha512-ZHao85gf0eZ0ESxLfCp73GG9O/VTytYDIkIiZDlURppLTI9wErSM/5yAKEq6rcUdxBLjMELmrYUJGg5sxGKMHg==
+browserslist@4.10.0:
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.10.0.tgz#f179737913eaf0d2b98e4926ac1ca6a15cbcc6a9"
+  integrity sha512-TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA==
   dependencies:
-    caniuse-lite "^1.0.30001023"
-    electron-to-chromium "^1.3.341"
-    node-releases "^1.1.47"
+    caniuse-lite "^1.0.30001035"
+    electron-to-chromium "^1.3.378"
+    node-releases "^1.1.52"
+    pkg-up "^3.1.0"
+
+browserslist@^4.0.0, browserslist@^4.11.1, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.8.5, browserslist@^4.9.1:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d"
+  integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==
+  dependencies:
+    caniuse-lite "^1.0.30001043"
+    electron-to-chromium "^1.3.413"
+    node-releases "^1.1.53"
+    pkg-up "^2.0.0"
 
 bser@2.1.1:
   version "2.1.1"
@@ -2537,6 +3088,29 @@ bser@2.1.1:
   dependencies:
     node-int64 "^0.4.0"
 
+buffer-alloc-unsafe@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
+
+buffer-alloc@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
+  dependencies:
+    buffer-alloc-unsafe "^1.1.0"
+    buffer-fill "^1.0.0"
+
+buffer-crc32@~0.2.3:
+  version "0.2.13"
+  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
+
+buffer-fill@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
+
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
@@ -2561,6 +3135,14 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
+buffer@^5.2.1:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786"
+  integrity sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
@@ -2577,9 +3159,9 @@ bytes@3.1.0:
   integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
 cacache@^12.0.2:
-  version "12.0.3"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390"
-  integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==
+  version "12.0.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
+  integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==
   dependencies:
     bluebird "^3.5.5"
     chownr "^1.1.1"
@@ -2636,6 +3218,19 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
+cacheable-request@^2.1.1:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
+  integrity sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=
+  dependencies:
+    clone-response "1.0.2"
+    get-stream "3.0.0"
+    http-cache-semantics "3.8.1"
+    keyv "3.0.0"
+    lowercase-keys "1.0.0"
+    normalize-url "2.0.1"
+    responselike "1.0.2"
+
 call-me-maybe@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
@@ -2665,13 +3260,13 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camel-case@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
-  integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
+camel-case@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz#1fc41c854f00e2f7d0139dfeba1542d6896fe547"
+  integrity sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==
   dependencies:
-    no-case "^2.2.0"
-    upper-case "^1.1.1"
+    pascal-case "^3.1.1"
+    tslib "^1.10.0"
 
 camelcase@5.0.0:
   version "5.0.0"
@@ -2698,10 +3293,32 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001023:
-  version "1.0.30001023"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001023.tgz#b82155827f3f5009077bdd2df3d8968bcbcc6fc4"
-  integrity sha512-C5TDMiYG11EOhVOA62W1p3UsJ2z4DsHtMBQtjzp3ZsUglcQn62WOUgW0y795c7A5uZ+GCEIvzkMatLIlAsbNTA==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001039, caniuse-lite@^1.0.30001043:
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+  version "1.0.30001054"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001054.tgz#7e82fc42d927980b0ce1426c4813df12381e1a75"
+  integrity sha512-jiKlTI6Ur8Kjfj8z0muGrV6FscpRvefcQVPSuMuXnvRCfExU7zlVLNjmOz1TnurWgUrAY7MMmjyy+uTgIl1XHw==
+=======
+  version "1.0.30001055"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001055.tgz#7b52c3537f7a8c0408aca867e83d2b04268b54cd"
+  integrity sha512-MbwsBmKrBSKIWldfdIagO5OJWZclpJtS4h0Jrk/4HFrXJxTdVdH23Fd+xCiHriVGvYcWyW8mR/CPsYajlH8Iuw==
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
+=======
+  version "1.0.30001059"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001059.tgz#7bff0613d94b6ea41cb5c864c966d340f8ae6d34"
+  integrity sha512-oOrc+jPJWooKIA0IrNZ5sYlsXc7NP7KLhNWrSGEJhnfSzDvDJ0zd3i6HXsslExY9bbu+x0FQ5C61LcqmPt7bOQ==
+<<<<<<< HEAD
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+  version "1.0.30001059"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001059.tgz#7bff0613d94b6ea41cb5c864c966d340f8ae6d34"
+  integrity sha512-oOrc+jPJWooKIA0IrNZ5sYlsXc7NP7KLhNWrSGEJhnfSzDvDJ0zd3i6HXsslExY9bbu+x0FQ5C61LcqmPt7bOQ==
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+=======
+>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -2720,6 +3337,16 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
+caw@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/caw/-/caw-2.0.1.tgz#6c3ca071fc194720883c2dc5da9b074bfc7e9e95"
+  integrity sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==
+  dependencies:
+    get-proxy "^2.0.0"
+    isurl "^1.0.0-alpha5"
+    tunnel-agent "^0.6.0"
+    url-to-options "^1.0.1"
+
 chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -2740,12 +3367,20 @@ chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chokidar@^2.0.2, chokidar@^2.1.8:
+chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
   integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
@@ -2765,9 +3400,9 @@ chokidar@^2.0.2, chokidar@^2.1.8:
     fsevents "^1.2.7"
 
 chokidar@^3.3.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.1.tgz#c84e5b3d18d9a4d77558fef466b1bf16bbeb3450"
-  integrity sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8"
+  integrity sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==
   dependencies:
     anymatch "~3.1.1"
     braces "~3.0.2"
@@ -2775,14 +3410,14 @@ chokidar@^3.3.0:
     is-binary-path "~2.1.0"
     is-glob "~4.0.1"
     normalize-path "~3.0.0"
-    readdirp "~3.3.0"
+    readdirp "~3.4.0"
   optionalDependencies:
     fsevents "~2.1.2"
 
 chownr@^1.1.1, chownr@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
-  integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
 chrome-trace-event@^1.0.2:
   version "1.0.2"
@@ -2814,12 +3449,12 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-classnames@^2.2.6:
+classnames@2.x, classnames@^2.2.3, classnames@^2.2.5, classnames@^2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
   integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
 
-clean-css@^4.2.1:
+clean-css@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
   integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
@@ -2839,9 +3474,9 @@ cli-cursor@^3.1.0:
     restore-cursor "^3.1.0"
 
 cli-width@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
-  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
+  integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
 
 cliui@^4.0.0:
   version "4.1.0"
@@ -2881,7 +3516,14 @@ clone-deep@^4.0.1:
     kind-of "^6.0.2"
     shallow-clone "^3.0.0"
 
-clsx@^1.0.2:
+clone-response@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
+  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
+  dependencies:
+    mimic-response "^1.0.0"
+
+clsx@^1.0.4:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.0.tgz#62937c6adfea771247c34b54d320fb99624f5702"
   integrity sha512-3avwM37fSK5oP6M5rQ9CNe99lwxhXDOeSWVPAOYF6OazUTgZCMb0yWlJpmdD74REy1gkEaFiub2ULv4fq9GUhA==
@@ -2920,12 +3562,19 @@ color-convert@^1.9.0, color-convert@^1.9.1:
   dependencies:
     color-name "1.1.3"
 
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-color-name@^1.0.0:
+color-name@^1.0.0, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
@@ -2938,6 +3587,11 @@ color-string@^1.5.2:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
+color-support@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
 color@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz#68148e7f85d41ad7649c5fa8c8106f098d229e10"
@@ -2958,10 +3612,17 @@ commander@^2.11.0, commander@^2.20.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.0.tgz#545983a0603fe425bc672d66c9e3c89c42121a83"
-  integrity sha512-NIQrwvv9V39FHgGFm36+U9SMQzbiHvU79k+iADraJTpmrFFfx7Ds0IvDoAdZsDrknlkRk14OYoWXb57uTh7/sw==
+commander@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
+  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
+
+commander@~2.8.1:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
+  integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=
+  dependencies:
+    graceful-readlink ">= 1.0.0"
 
 common-tags@^1.8.0:
   version "1.8.0"
@@ -3020,6 +3681,14 @@ concat-stream@^1.5.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
+config-chain@^1.1.11:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
+  integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==
+  dependencies:
+    ini "^1.3.4"
+    proto-list "~1.2.1"
+
 confusing-browser-globals@^1.0.9:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz#72bc13b483c0276801681871d4898516f8f54fdd"
@@ -3045,7 +3714,7 @@ contains-path@^0.1.0:
   resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
   integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
 
-content-disposition@0.5.3:
+content-disposition@0.5.3, content-disposition@^0.5.2:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
   integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
@@ -3097,17 +3766,17 @@ copy-descriptor@^0.1.0:
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 core-js-compat@^3.6.2:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.4.tgz#938476569ebb6cda80d339bcf199fae4f16fff17"
-  integrity sha512-zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA==
+  version "3.6.5"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz#2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"
+  integrity sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==
   dependencies:
-    browserslist "^4.8.3"
+    browserslist "^4.8.5"
     semver "7.0.0"
 
 core-js-pure@^3.0.0:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.4.tgz#4bf1ba866e25814f149d4e9aaa08c36173506e3a"
-  integrity sha512-epIhRLkXdgv32xIUFaaAry2wdxZYBi6bgM7cB136dzzXXa+dFyRLTZeLUJxnd8ShrmyVXBub63n2NHo2JAt8Cw==
+  version "3.6.5"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813"
+  integrity sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==
 
 core-js@^1.0.0:
   version "1.2.7"
@@ -3120,9 +3789,9 @@ core-js@^2.4.0:
   integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
 
 core-js@^3.5.0:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
-  integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==
+  version "3.6.5"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
+  integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -3158,7 +3827,7 @@ create-ecdh@^4.0.0:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
 
-create-hash@^1.1.0, create-hash@^1.1.2:
+create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
   integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
@@ -3169,7 +3838,7 @@ create-hash@^1.1.0, create-hash@^1.1.2:
     ripemd160 "^2.0.1"
     sha.js "^2.4.0"
 
-create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
+create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
   integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
@@ -3326,17 +3995,20 @@ css-tree@1.0.0-alpha.37:
     mdn-data "2.0.4"
     source-map "^0.6.1"
 
-css-unit-converter@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz#d9b9281adcfd8ced935bdbaba83786897f64e996"
-  integrity sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=
+css-tree@1.0.0-alpha.39:
+  version "1.0.0-alpha.39"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.39.tgz#2bff3ffe1bb3f776cf7eefd91ee5cba77a149eeb"
+  integrity sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==
+  dependencies:
+    mdn-data "2.0.6"
+    source-map "^0.6.1"
 
 css-vendor@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.7.tgz#4e6d53d953c187981576d6a542acc9fb57174bda"
-  integrity sha512-VS9Rjt79+p7M0WkPqcAza4Yq1ZHrsHrwf7hPL/bjQB+c1lwmAI+1FXxYTYt818D/50fFVflw0XKleiBN5RITkg==
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.8.tgz#e47f91d3bd3117d49180a3c935e62e3d9f7f449d"
+  integrity sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==
   dependencies:
-    "@babel/runtime" "^7.6.2"
+    "@babel/runtime" "^7.8.3"
     is-in-browser "^1.0.2"
 
 css-what@2.1:
@@ -3448,11 +4120,11 @@ cssnano@^4.1.10:
     postcss "^7.0.0"
 
 csso@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-4.0.2.tgz#e5f81ab3a56b8eefb7f0092ce7279329f454de3d"
-  integrity sha512-kS7/oeNVXkHWxby5tHVxlhjizRCSv8QdU7hB2FpdAibDU8FjTAolhNjKNTiLzXtUrKT6HwClE81yXwEk1309wg==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-4.0.3.tgz#0d9985dc852c7cc2b2cacfbbe1079014d1a8e903"
+  integrity sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==
   dependencies:
-    css-tree "1.0.0-alpha.37"
+    css-tree "1.0.0-alpha.39"
 
 cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0", cssom@^0.3.4:
   version "0.3.8"
@@ -3467,9 +4139,9 @@ cssstyle@^1.0.0, cssstyle@^1.1.1:
     cssom "0.3.x"
 
 csstype@^2.2.0, csstype@^2.5.2, csstype@^2.6.5, csstype@^2.6.7:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.9.tgz#05141d0cd557a56b8891394c1911c40c8a98d098"
-  integrity sha512-xz39Sb4+OaTsULgUERcCk+TJj8ylkL4aSVDQiX/ksxbELSqwkgt4d4RD7fovIdgJGSuNYqwZEiVjYY5l0ask+Q==
+  version "2.6.10"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz#e63af50e66d7c266edb6b32909cfd0aabe03928b"
+  integrity sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w==
 
 cyclist@^1.0.1:
   version "1.0.1"
@@ -3543,6 +4215,66 @@ decode-uri-component@^0.2.0:
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
+decompress-response@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
+  dependencies:
+    mimic-response "^1.0.0"
+
+decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-4.1.1.tgz#718cbd3fcb16209716e70a26b84e7ba4592e5af1"
+  integrity sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==
+  dependencies:
+    file-type "^5.2.0"
+    is-stream "^1.1.0"
+    tar-stream "^1.5.2"
+
+decompress-tarbz2@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz#3082a5b880ea4043816349f378b56c516be1a39b"
+  integrity sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==
+  dependencies:
+    decompress-tar "^4.1.0"
+    file-type "^6.1.0"
+    is-stream "^1.1.0"
+    seek-bzip "^1.0.5"
+    unbzip2-stream "^1.0.9"
+
+decompress-targz@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/decompress-targz/-/decompress-targz-4.1.1.tgz#c09bc35c4d11f3de09f2d2da53e9de23e7ce1eee"
+  integrity sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==
+  dependencies:
+    decompress-tar "^4.1.1"
+    file-type "^5.2.0"
+    is-stream "^1.1.0"
+
+decompress-unzip@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-4.0.1.tgz#deaaccdfd14aeaf85578f733ae8210f9b4848f69"
+  integrity sha1-3qrM39FK6vhVePczroIQ+bSEj2k=
+  dependencies:
+    file-type "^3.8.0"
+    get-stream "^2.2.0"
+    pify "^2.3.0"
+    yauzl "^2.4.2"
+
+decompress@^4.2.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/decompress/-/decompress-4.2.1.tgz#007f55cc6a62c055afa37c07eb6a4ee1b773f118"
+  integrity sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==
+  dependencies:
+    decompress-tar "^4.0.0"
+    decompress-tarbz2 "^4.0.0"
+    decompress-targz "^4.0.0"
+    decompress-unzip "^4.0.1"
+    graceful-fs "^4.1.10"
+    make-dir "^1.0.0"
+    pify "^2.3.0"
+    strip-dirs "^2.0.0"
+
 deep-equal@^1.0.1, deep-equal@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
@@ -3715,6 +4447,16 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
+dom-accessibility-api@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.3.0.tgz#511e5993dd673b97c87ea47dba0e3892f7e0c983"
+  integrity sha512-PzwHEmsRP3IGY4gv/Ug+rMeaTIyTJvadCb+ujYXYeIylbHJezIyNToe8KfEgHTCEYyC+/bUghYOGg8yMGlZ6vA==
+
+dom-align@^1.7.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.12.0.tgz#56fb7156df0b91099830364d2d48f88963f5a29c"
+  integrity sha512-YkoezQuhp3SLFGdOlr5xkqZ640iXrnHAwVYcDg8ZKRUtO7mSzSC2BA5V0VuyAwPSJA4CLIc6EDDJh4bEsD2+zA==
+
 dom-converter@^0.2:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
@@ -3723,11 +4465,11 @@ dom-converter@^0.2:
     utila "~0.4"
 
 dom-helpers@^5.0.1:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.3.tgz#7233248eb3a2d1f74aafca31e52c5299cc8ce821"
-  integrity sha512-nZD1OtwfWGRBWlpANxacBEZrEuLa16o1nh7YopFWeoF68Zt8GGEmzHu6Xv4F3XaFIC+YXtTLrzgqKxFgLEe4jw==
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.4.tgz#4609680ab5c79a45f2531441f1949b79d6587f4b"
+  integrity sha512-TjMyeVUvNEnOnhzs6uAn9Ya47GmMo3qq7m+Lr/3ON0Rs5kHvb8I+SQYjLUSYn7qhEm0QjW0yrBkvz9yOrwwz1A==
   dependencies:
-    "@babel/runtime" "^7.6.3"
+    "@babel/runtime" "^7.8.7"
     csstype "^2.6.7"
 
 dom-serializer@0:
@@ -3783,12 +4525,20 @@ domutils@^1.5.1, domutils@^1.7.0:
     dom-serializer "0"
     domelementtype "1"
 
-dot-prop@^4.1.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
-  integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
+dot-case@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz#21d3b52efaaba2ea5fda875bb1aa8124521cf4aa"
+  integrity sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==
   dependencies:
-    is-obj "^1.0.0"
+    no-case "^3.0.3"
+    tslib "^1.10.0"
+
+dot-prop@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"
+  integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==
+  dependencies:
+    is-obj "^2.0.0"
 
 dotenv-expand@5.1.0:
   version "5.1.0"
@@ -3800,6 +4550,29 @@ dotenv@8.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
   integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
 
+download@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/download/-/download-7.1.0.tgz#9059aa9d70b503ee76a132897be6dec8e5587233"
+  integrity sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ==
+  dependencies:
+    archive-type "^4.0.0"
+    caw "^2.0.1"
+    content-disposition "^0.5.2"
+    decompress "^4.2.0"
+    ext-name "^5.0.0"
+    file-type "^8.1.0"
+    filenamify "^2.0.0"
+    get-stream "^3.0.0"
+    got "^8.3.1"
+    make-dir "^1.2.0"
+    p-event "^2.1.0"
+    pify "^3.0.0"
+
+duplexer3@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
+
 duplexer@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
@@ -3828,12 +4601,34 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.341:
-  version "1.3.344"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.344.tgz#f1397a633c35e726730c24be1084cd25c3ee8148"
-  integrity sha512-tvbx2Wl8WBR+ym3u492D0L6/jH+8NoQXqe46+QhbWH3voVPauGuZYeb1QAXYoOAWuiP2dbSvlBx0kQ1F3hu/Mw==
+electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.413:
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+  version "1.3.432"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.432.tgz#3bf7b191978ff2e8bc3caf811bb52b1e9f9eab25"
+  integrity sha512-/GdNhXyLP5Yl2322CUX/+Xi8NhdHBqL6lD9VJVKjH6CjoPGakvwZ5CpKgj/oOlbzuWWjOvMjDw1bBuAIRCNTlw==
+=======
+  version "1.3.438"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.438.tgz#56051a9b148842fec813b113e8070ae892a85920"
+  integrity sha512-QKMcpfA/fCOnqFHsZvKr2haQQb3eXkDI17zT+4hHxJJThyN5nShcG6q1VR8vRiE/2GCJM+0p3PzinYknkdsBYg==
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+  version "1.3.434"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.434.tgz#a67dcb268e93768e2169399999ccffa4783f048e"
+  integrity sha512-WjzGrE6appXvMyc2kH9Ide7OxsgTuRzag9sjQ5AcbOnbS9ut7P1HzOeEbJFLhr81IR7n2Hlr6qTTSGTXLIX5Pg==
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
+=======
+  version "1.3.438"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.438.tgz#56051a9b148842fec813b113e8070ae892a85920"
+  integrity sha512-QKMcpfA/fCOnqFHsZvKr2haQQb3eXkDI17zT+4hHxJJThyN5nShcG6q1VR8vRiE/2GCJM+0p3PzinYknkdsBYg==
+<<<<<<< HEAD
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+=======
+>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
 
-elliptic@^6.0.0:
+elliptic@^6.0.0, elliptic@^6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
   integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==
@@ -3861,6 +4656,11 @@ emojis-list@^2.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
   integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
+emojis-list@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
+
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -3895,9 +4695,21 @@ entities@^1.1.1:
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
 entities@^2.0.0:
+<<<<<<< HEAD
+<<<<<<< HEAD
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
   integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
+=======
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.2.tgz#ac74db0bba8d33808bbf36809c3a5c3683531436"
+  integrity sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw==
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.2.tgz#ac74db0bba8d33808bbf36809c3a5c3683531436"
+  integrity sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw==
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
 
 errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
@@ -3913,10 +4725,10 @@ error-ex@^1.2.0, error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2:
-  version "1.17.4"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184"
-  integrity sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==
+es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5:
+  version "1.17.5"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9"
+  integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==
   dependencies:
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
@@ -3981,9 +4793,9 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 escodegen@^1.11.0, escodegen@^1.9.1:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.13.0.tgz#c7adf9bd3f3cc675bb752f202f79a720189cab29"
-  integrity sha512-eYk2dCkxR07DsHA/X2hRBj0CFAZeri/LyDMc0C8JT1Hqi6JnVpMhJ7XFITbb0+yZS3lVkaPL2oCkZ3AVmeVbMw==
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457"
+  integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==
   dependencies:
     esprima "^4.0.1"
     estraverse "^4.2.0"
@@ -3992,10 +4804,37 @@ escodegen@^1.11.0, escodegen@^1.9.1:
   optionalDependencies:
     source-map "~0.6.1"
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+eslint-config-airbnb-base@^14.1.0:
+  version "14.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.1.0.tgz#2ba4592dd6843258221d9bff2b6831bd77c874e4"
+  integrity sha512-+XCcfGyCnbzOnktDVhwsCAx+9DmrzEmuwxyHUJpw+kqBVT744OUBrB09khgFKlK1lshVww6qXGsYPZpavoNjJw==
+  dependencies:
+    confusing-browser-globals "^1.0.9"
+    object.assign "^4.1.0"
+    object.entries "^1.1.1"
+
+eslint-config-airbnb@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-18.1.0.tgz#724d7e93dadd2169492ff5363c5aaa779e01257d"
+  integrity sha512-kZFuQC/MPnH7KJp6v95xsLBf63G/w7YqdPfQ0MUanxQ7zcKUNG8j+sSY860g3NwCBOa62apw16J6pRN+AOgXzw==
+  dependencies:
+    eslint-config-airbnb-base "^14.1.0"
+    object.assign "^4.1.0"
+    object.entries "^1.1.1"
+
+<<<<<<< HEAD
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
 eslint-config-react-app@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.2.0.tgz#135110ba56a9e378f7acfe5f36e2ae76a2317899"
-  integrity sha512-WrHjoGpKr1kLLiWDD81tme9jMM0hk5cMxasLSdyno6DdPt+IfLOrDJBVo6jN7tn4y1nzhs43TmUaZWO6Sf0blw==
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.2.1.tgz#698bf7aeee27f0cea0139eaef261c7bf7dd623df"
+  integrity sha512-pGIZ8t0mFLcV+6ZirRgYK6RVqUIKRIi9MmgzUEmrIknsn3AdO0I32asO86dJgloHq+9ZPl8UIg8mYrvgP5u2wQ==
   dependencies:
     confusing-browser-globals "^1.0.9"
 
@@ -4019,13 +4858,27 @@ eslint-loader@3.0.3:
     schema-utils "^2.6.1"
 
 eslint-module-utils@^2.4.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz#7878f7504824e1b857dd2505b59a8e5eda26a708"
-  integrity sha512-LGScZ/JSlqGKiT8OC+cYRxseMjyqt6QO54nl281CK93unD89ijSeRV6An8Ci/2nvWVKe8K/Tqdm75RQoIOCr+Q==
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
+  integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==
   dependencies:
     debug "^2.6.9"
     pkg-dir "^2.0.0"
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+eslint-plugin-chai-friendly@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-chai-friendly/-/eslint-plugin-chai-friendly-0.6.0.tgz#54052fab79302ed0cea76ab997351ea4809bfb77"
+  integrity sha512-Uvvv1gkbRGp/qfN15B0kQyQWg+oFA8buDSqrwmW3egNSk/FpqH2MjQqKOuKwmEL6w4QIQrIjDp+gg6kGGmD3oQ==
+
+<<<<<<< HEAD
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
 eslint-plugin-flowtype@4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-4.6.0.tgz#82b2bd6f21770e0e5deede0228e456cb35308451"
@@ -4109,6 +4962,13 @@ eslint-utils@^1.4.3:
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
+eslint-utils@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz#7be1cc70f27a72a76cd14aa698bcabed6890e1cd"
+  integrity sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==
+  dependencies:
+    eslint-visitor-keys "^1.1.0"
+
 eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
@@ -4158,12 +5018,12 @@ eslint@^6.6.0:
     v8-compile-cache "^2.0.3"
 
 espree@^6.1.2:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz#6c272650932b4f91c3714e5e7b5f5e2ecf47262d"
-  integrity sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"
+  integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
   dependencies:
-    acorn "^7.1.0"
-    acorn-jsx "^5.1.0"
+    acorn "^7.1.1"
+    acorn-jsx "^5.2.0"
     eslint-visitor-keys "^1.1.0"
 
 esprima@^4.0.0, esprima@^4.0.1:
@@ -4172,11 +5032,11 @@ esprima@^4.0.0, esprima@^4.0.1:
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esquery@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
-  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
+  integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
   dependencies:
-    estraverse "^4.0.0"
+    estraverse "^5.1.0"
 
 esrecurse@^4.1.0:
   version "4.2.1"
@@ -4185,12 +5045,17 @@ esrecurse@^4.1.0:
   dependencies:
     estraverse "^4.1.0"
 
-estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-esutils@^2.0.0, esutils@^2.0.2:
+estraverse@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
+  integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==
+
+esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
@@ -4201,9 +5066,21 @@ etag@~1.8.1:
   integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
 eventemitter3@^4.0.0:
+<<<<<<< HEAD
+<<<<<<< HEAD
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb"
   integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==
+=======
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384"
+  integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384"
+  integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
 
 events@^3.0.0:
   version "3.1.0"
@@ -4314,6 +5191,21 @@ express@^4.17.1:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+ext-list@^2.0.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz#0b98e64ed82f5acf0f2931babf69212ef52ddd37"
+  integrity sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==
+  dependencies:
+    mime-db "^1.28.0"
+
+ext-name@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ext-name/-/ext-name-5.0.0.tgz#70781981d183ee15d13993c8822045c506c8f0a6"
+  integrity sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==
+  dependencies:
+    ext-list "^2.0.0"
+    sort-keys-length "^1.0.0"
+
 ext@^1.1.2:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244"
@@ -4336,7 +5228,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@~3.0.2:
+extend@3.0.2, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -4374,6 +5266,16 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
+fancy-log@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
+  integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
+  dependencies:
+    ansi-gray "^0.1.1"
+    color-support "^1.1.3"
+    parse-node-version "^1.0.0"
+    time-stamp "^1.0.0"
+
 fast-deep-equal@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
@@ -4435,15 +5337,22 @@ fbjs@^0.8.16:
     setimmediate "^1.0.5"
     ua-parser-js "^0.7.18"
 
+fd-slicer@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
+  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
+  dependencies:
+    pend "~1.2.0"
+
 figgy-pudding@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
-  integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
+  integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
 
 figures@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.1.0.tgz#4b198dd07d8d71530642864af2d45dd9e459c4ec"
-  integrity sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
   dependencies:
     escape-string-regexp "^1.0.5"
 
@@ -4462,11 +5371,50 @@ file-loader@4.3.0:
     loader-utils "^1.2.3"
     schema-utils "^2.5.0"
 
+file-type@^3.8.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9"
+  integrity sha1-JXoHg4TR24CHvESdEH1SpSZyuek=
+
+file-type@^4.2.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-4.4.0.tgz#1b600e5fca1fbdc6e80c0a70c71c8dba5f7906c5"
+  integrity sha1-G2AOX8ofvcboDApwxxyNul95BsU=
+
+file-type@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"
+  integrity sha1-LdvqfHP/42No365J3DOMBYwritY=
+
+file-type@^6.1.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-6.2.0.tgz#e50cd75d356ffed4e306dc4f5bcf52a79903a919"
+  integrity sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==
+
+file-type@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-8.1.0.tgz#244f3b7ef641bbe0cca196c7276e4b332399f68c"
+  integrity sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==
+
 file-uri-to-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
   integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
+filename-reserved-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229"
+  integrity sha1-q/c9+rc10EVECr/qLZHzieu/oik=
+
+filenamify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-2.1.0.tgz#88faf495fb1b47abfd612300002a16228c677ee9"
+  integrity sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==
+  dependencies:
+    filename-reserved-regex "^2.0.0"
+    strip-outer "^1.0.0"
+    trim-repeated "^1.0.0"
+
 filesize@6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.0.1.tgz#f850b509909c7c86f7e450ea19006c31c2ed3d2f"
@@ -4521,12 +5469,12 @@ find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
     pkg-dir "^3.0.0"
 
 find-cache-dir@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.2.0.tgz#e7fe44c1abc1299f516146e563108fd1006c1874"
-  integrity sha512-1JKclkYYsf1q9WIJKLZa9S9muC+08RIjzAlLrK4QcYLJMS6mk9yombQ9qf+zJ7H9LS800k0s44L4sDq9VYzqyg==
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
+  integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
   dependencies:
     commondir "^1.0.1"
-    make-dir "^3.0.0"
+    make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
 find-up@4.1.0, find-up@^4.0.0:
@@ -4569,9 +5517,9 @@ flat-cache@^2.0.1:
     write "1.0.3"
 
 flatted@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
-  integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
+  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
 
 flatten@^1.0.2:
   version "1.0.3"
@@ -4594,9 +5542,9 @@ follow-redirects@1.5.10:
     debug "=3.1.0"
 
 follow-redirects@^1.0.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.10.0.tgz#01f5263aee921c6a54fb91667f08f4155ce169eb"
-  integrity sha512-4eyLK6s6lH32nOvLLwlIOnr9zrL8Sm+OvW4pVTJNoXeGzYIkHVf+pADQi+OJ0E67hiuSLezPVPyBcIZO50TmmQ==
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz#afa14f08ba12a52963140fe43212658897bc0ecb"
+  integrity sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA==
   dependencies:
     debug "^3.0.0"
 
@@ -4662,7 +5610,7 @@ fresh@0.5.2:
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
-from2@^2.1.0:
+from2@^2.1.0, from2@^2.1.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
   integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
@@ -4670,6 +5618,11 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+
 fs-extra@^4.0.2:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
@@ -4719,19 +5672,24 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@2.1.2, fsevents@~2.1.2:
+fsevents@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
   integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==
 
 fsevents@^1.2.7:
-  version "1.2.11"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz#67bf57f4758f02ede88fb2a1712fef4d15358be3"
-  integrity sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
+  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
   dependencies:
     bindings "^1.5.0"
     nan "^2.12.1"
 
+fsevents@~2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
+  integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -4762,6 +5720,26 @@ get-own-enumerable-property-symbols@^3.0.0:
   resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
   integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==
 
+get-proxy@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/get-proxy/-/get-proxy-2.1.0.tgz#349f2b4d91d44c4d4d4e9cba2ad90143fac5ef93"
+  integrity sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==
+  dependencies:
+    npm-conf "^1.1.0"
+
+get-stream@3.0.0, get-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
+
+get-stream@^2.2.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de"
+  integrity sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=
+  dependencies:
+    object-assign "^4.0.1"
+    pinkie-promise "^2.0.0"
+
 get-stream@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -4790,9 +5768,9 @@ glob-parent@^3.1.0:
     path-dirname "^1.0.0"
 
 glob-parent@^5.0.0, glob-parent@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
-  integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
+  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
   dependencies:
     is-glob "^4.0.1"
 
@@ -4835,9 +5813,9 @@ globals@^11.1.0:
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^12.1.0:
-  version "12.3.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz#1e564ee5c4dded2ab098b0f88f24702a3c56be13"
-  integrity sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==
+  version "12.4.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
+  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
   dependencies:
     type-fest "^0.8.1"
 
@@ -4865,10 +5843,38 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
-  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
+got@^8.3.1:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
+  integrity sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==
+  dependencies:
+    "@sindresorhus/is" "^0.7.0"
+    cacheable-request "^2.1.1"
+    decompress-response "^3.3.0"
+    duplexer3 "^0.1.4"
+    get-stream "^3.0.0"
+    into-stream "^3.1.0"
+    is-retry-allowed "^1.1.0"
+    isurl "^1.0.0-alpha5"
+    lowercase-keys "^1.0.0"
+    mimic-response "^1.0.0"
+    p-cancelable "^0.4.0"
+    p-timeout "^2.0.1"
+    pify "^3.0.0"
+    safe-buffer "^5.1.1"
+    timed-out "^4.0.1"
+    url-parse-lax "^3.0.0"
+    url-to-options "^1.0.1"
+
+graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+
+"graceful-readlink@>= 1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
 
 growly@^1.3.0:
   version "1.3.0"
@@ -4889,16 +5895,16 @@ gzip-size@5.1.1:
     pify "^4.0.1"
 
 handle-thing@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
-  integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
+  integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
-har-validator@~5.1.0:
+har-validator@~5.1.3:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
   integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
@@ -4928,11 +5934,23 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
+has-symbol-support-x@^1.4.1:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
+  integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
+
 has-symbols@^1.0.0, has-symbols@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
+has-to-string-tag-x@^1.2.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
+  integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==
+  dependencies:
+    has-symbol-support-x "^1.4.1"
+
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -4972,12 +5990,13 @@ has@^1.0.0, has@^1.0.3:
     function-bind "^1.1.1"
 
 hash-base@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
-  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
+  integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
   dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
+    inherits "^2.0.4"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
 
 hash.js@^1.0.0, hash.js@^1.0.3:
   version "1.1.7"
@@ -5018,7 +6037,7 @@ hmac-drbg@^1.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.2.1, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -5026,9 +6045,9 @@ hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-
     react-is "^16.7.0"
 
 hosted-git-info@^2.1.4:
-  version "2.8.5"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"
-  integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
+  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
 
 hpack.js@^2.1.6:
   version "2.1.6"
@@ -5063,27 +6082,49 @@ html-encoding-sniffer@^1.0.2:
     whatwg-encoding "^1.0.1"
 
 html-entities@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
-  integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"
+  integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==
 
 html-escaper@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.0.tgz#71e87f931de3fe09e56661ab9a29aadec707b491"
-  integrity sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
 html-minifier-terser@^5.0.1:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.2.tgz#0e67a0b062ae1dd0719fc73199479298f807ae16"
-  integrity sha512-VAaitmbBuHaPKv9bj47XKypRhgDxT/cDLvsPiiF7w+omrN3K0eQhpigV9Z1ilrmHa9e0rOYcD6R/+LCDADGcnQ==
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz#95d3df037f04835e9d1a09d1767c0e361a7de916"
+  integrity sha512-tiYE76O1zunboByeB/nFGwUEb263Z3nkNv6Lz2oLC1s6M36bLKfTrjQ+7ssVfaucVllE+N7hh/FbpbxvnIA+LQ==
+=======
+<<<<<<< HEAD
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054"
+  integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054"
+  integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+=======
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054"
+  integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==
+>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
   dependencies:
-    camel-case "^3.0.0"
-    clean-css "^4.2.1"
-    commander "^4.0.0"
+    camel-case "^4.1.1"
+    clean-css "^4.2.3"
+    commander "^4.1.1"
     he "^1.2.0"
-    param-case "^2.1.1"
+    param-case "^3.0.3"
     relateurl "^0.2.7"
-    terser "^4.3.9"
+    terser "^4.6.3"
 
 html-webpack-plugin@4.0.0-beta.11:
   version "4.0.0-beta.11"
@@ -5109,6 +6150,11 @@ htmlparser2@^3.3.0:
     inherits "^2.0.1"
     readable-stream "^3.1.1"
 
+http-cache-semantics@3.8.1:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
+  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
+
 http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
@@ -5308,7 +6354,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -5323,12 +6369,12 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-ini@^1.3.5:
+ini@^1.3.4, ini@^1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
-inquirer@7.0.4, inquirer@^7.0.0:
+inquirer@7.0.4:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.4.tgz#99af5bde47153abca23f5c7fc30db247f39da703"
   integrity sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ==
@@ -5347,6 +6393,25 @@ inquirer@7.0.4, inquirer@^7.0.0:
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
+inquirer@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz#1298a01859883e17c7264b82870ae1034f92dd29"
+  integrity sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    chalk "^3.0.0"
+    cli-cursor "^3.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.15"
+    mute-stream "0.0.8"
+    run-async "^2.4.0"
+    rxjs "^6.5.3"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+    through "^2.3.6"
+
 internal-ip@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
@@ -5355,6 +6420,14 @@ internal-ip@^4.3.0:
     default-gateway "^4.2.0"
     ipaddr.js "^1.9.0"
 
+into-stream@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
+  integrity sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=
+  dependencies:
+    from2 "^2.1.1"
+    p-is-promise "^1.1.0"
+
 invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
@@ -5377,12 +6450,7 @@ ip@^1.1.0, ip@^1.1.5:
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
   integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
 
-ipaddr.js@1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
-  integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
-
-ipaddr.js@^1.9.0:
+ipaddr.js@1.9.1, ipaddr.js@^1.9.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
@@ -5574,6 +6642,11 @@ is-in-browser@^1.0.2, is-in-browser@^1.1.3:
   resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835"
   integrity sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU=
 
+is-natural-number@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8"
+  integrity sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=
+
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -5586,11 +6659,21 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-obj@^1.0.0, is-obj@^1.0.1:
+is-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
   integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
 
+is-obj@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
+  integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
+
+is-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
+  integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA=
+
 is-path-cwd@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
@@ -5622,11 +6705,6 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-promise@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
-
 is-regex@^1.0.4, is-regex@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
@@ -5644,6 +6722,11 @@ is-resolvable@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
   integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
 
+is-retry-allowed@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
+  integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==
+
 is-root@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c"
@@ -5689,9 +6772,11 @@ is-wsl@^1.1.0:
   integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
 is-wsl@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.1.1.tgz#4a1c152d429df3d441669498e2486d3596ebaf1d"
-  integrity sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
+  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
+  dependencies:
+    is-docker "^2.0.0"
 
 isarray@0.0.1:
   version "0.0.1"
@@ -5778,6 +6863,14 @@ istanbul-reports@^2.2.6:
   dependencies:
     html-escaper "^2.0.0"
 
+isurl@^1.0.0-alpha5:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
+  integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==
+  dependencies:
+    has-to-string-tag-x "^1.2.0"
+    is-object "^1.0.1"
+
 jest-changed-files@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.9.0.tgz#08d8c15eb79a7fa3fc98269bc14b451ee82f8039"
@@ -6150,9 +7243,9 @@ jest-worker@^24.6.0, jest-worker@^24.9.0:
     supports-color "^6.1.0"
 
 jest-worker@^25.1.0:
-  version "25.1.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.1.0.tgz#75d038bad6fdf58eba0d2ec1835856c497e3907a"
-  integrity sha512-ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg==
+  version "25.5.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.5.0.tgz#2611d071b79cea0f43ee57a3d118593ac1547db1"
+  integrity sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==
   dependencies:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
@@ -6262,6 +7355,11 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
+json-buffer@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
+  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
+
 json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
@@ -6306,12 +7404,12 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.1.tgz#81b6cb04e9ba496f1c7005d07b4368a2638f90b6"
-  integrity sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==
+json5@^2.1.0, json5@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
   dependencies:
-    minimist "^1.2.0"
+    minimist "^1.2.5"
 
 jsonfile@^4.0.0:
   version "4.0.0"
@@ -6336,68 +7434,68 @@ jsprim@^1.2.2:
     verror "1.10.0"
 
 jss-plugin-camel-case@^10.0.3:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.0.4.tgz#3dedecec1e5bba0bf6141c2c05e2ab11ea4b468d"
-  integrity sha512-+wnqxJsyfUnOn0LxVg3GgZBSjfBCrjxwx7LFxwVTUih0ceGaXKZoieheNOaTo5EM4w8bt1nbb8XonpQCj67C6A==
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.1.1.tgz#8e73ecc4f1d0f8dfe4dd31f6f9f2782588970e78"
+  integrity sha512-MDIaw8FeD5uFz1seQBKz4pnvDLnj5vIKV5hXSVdMaAVq13xR6SVTVWkIV/keyTs5txxTvzGJ9hXoxgd1WTUlBw==
   dependencies:
     "@babel/runtime" "^7.3.1"
     hyphenate-style-name "^1.0.3"
-    jss "10.0.4"
+    jss "10.1.1"
 
 jss-plugin-default-unit@^10.0.3:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.0.4.tgz#df03885de20f20a1fc1c21bdb7c62e865ee400d9"
-  integrity sha512-T0mhL/Ogp/quvod/jAHEqKvptLDxq7Cj3a+7zRuqK8HxUYkftptN89wJElZC3rshhNKiogkEYhCWenpJdFvTBg==
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.1.1.tgz#2df86016dfe73085eead843f5794e3890e9c5c47"
+  integrity sha512-UkeVCA/b3QEA4k0nIKS4uWXDCNmV73WLHdh2oDGZZc3GsQtlOCuiH3EkB/qI60v2MiCq356/SYWsDXt21yjwdg==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.0.4"
+    jss "10.1.1"
 
 jss-plugin-global@^10.0.3:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.0.4.tgz#412245b56133cc88bec654a70d82d5922619f4c5"
-  integrity sha512-N8n9/GHENZce+sqE4UYiZiJtI+t+erT/BypHOrNYAfIoNEj7OYsOEKfIo2P0GpLB3QyDAYf5eo9XNdZ8veEkUA==
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.1.1.tgz#36b0d6d9facb74dfd99590643708a89260747d14"
+  integrity sha512-VBG3wRyi3Z8S4kMhm8rZV6caYBegsk+QnQZSVmrWw6GVOT/Z4FA7eyMu5SdkorDlG/HVpHh91oFN56O4R9m2VA==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.0.4"
+    jss "10.1.1"
 
 jss-plugin-nested@^10.0.3:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.0.4.tgz#4d15ad13995fb6e4125618006473a096d2475d75"
-  integrity sha512-QM21BKVt8LDeoRfowvAMh/s+/89VYrreIIE6ch4pvw0oAXDWw1iorUPlqLZ7uCO3UL0uFtQhJq3QMLN6Lr1v0A==
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.1.1.tgz#5c3de2b8bda344de1ebcef3a4fd30870a29a8a8c"
+  integrity sha512-ozEu7ZBSVrMYxSDplPX3H82XHNQk2DQEJ9TEyo7OVTPJ1hEieqjDFiOQOxXEj9z3PMqkylnUbvWIZRDKCFYw5Q==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.0.4"
+    jss "10.1.1"
     tiny-warning "^1.0.2"
 
 jss-plugin-props-sort@^10.0.3:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.0.4.tgz#43c880ff8dfcf858f809f663ece5e65a1d945b5a"
-  integrity sha512-WoETdOCjGskuin/OMt2uEdDPLZF3vfQuHXF+XUHGJrq0BAapoyGQDcv37SeReDlkRAbVXkEZPsIMvYrgHSHFiA==
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.1.1.tgz#34bddcbfaf9430ec8ccdf92729f03bb10caf1785"
+  integrity sha512-g/joK3eTDZB4pkqpZB38257yD4LXB0X15jxtZAGbUzcKAVUHPl9Jb47Y7lYmiGsShiV4YmQRqG1p2DHMYoK91g==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.0.4"
+    jss "10.1.1"
 
 jss-plugin-rule-value-function@^10.0.3:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.0.4.tgz#2f4cf4a86ad3eba875bb48cb9f4a7ed35cb354e7"
-  integrity sha512-0hrzOSWRF5ABJGaHrlnHbYZjU877Ofzfh2id3uLtBvemGQLHI+ldoL8/+6iPSRa7M8z8Ngfg2vfYhKjUA5gA0g==
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.1.1.tgz#be00dac6fc394aaddbcef5860b9eca6224d96382"
+  integrity sha512-ClV1lvJ3laU9la1CUzaDugEcwnpjPTuJ0yGy2YtcU+gG/w9HMInD5vEv7xKAz53Bk4WiJm5uLOElSEshHyhKNw==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.0.4"
+    jss "10.1.1"
 
 jss-plugin-vendor-prefixer@^10.0.3:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.0.4.tgz#1626ef612a4541cff17cf96815e1740155214ed2"
-  integrity sha512-4JgEbcrdeMda1qvxTm1CnxFJAWVV++VLpP46HNTrfH7VhVlvUpihnUNs2gAlKuRT/XSBuiWeLAkrTqF4NVrPig==
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.1.1.tgz#8348b20749f790beebab3b6a8f7075b07c2cfcfd"
+  integrity sha512-09MZpQ6onQrhaVSF6GHC4iYifQ7+4YC/tAP6D4ZWeZotvCMq1mHLqNKRIaqQ2lkgANjlEot2JnVi1ktu4+L4pw==
   dependencies:
     "@babel/runtime" "^7.3.1"
     css-vendor "^2.0.7"
-    jss "10.0.4"
+    jss "10.1.1"
 
-jss@10.0.4, jss@^10.0.3:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/jss/-/jss-10.0.4.tgz#46ebdde1c40c9a079d64f3334cb88ae28fd90bfd"
-  integrity sha512-GqHmeDK83qbqMAVjxyPfN1qJVTKZne533a9bdCrllZukUM8npG/k+JumEPI86IIB5ifaZAHG2HAsUziyxOiooQ==
+jss@10.1.1, jss@^10.0.3:
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/jss/-/jss-10.1.1.tgz#450b27d53761af3e500b43130a54cdbe157ea332"
+  integrity sha512-Xz3qgRUFlxbWk1czCZibUJqhVPObrZHxY3FPsjCXhDld4NOj1BgM14Ir5hVm+Qr6OLqVljjGvoMcCdXNOAbdkQ==
   dependencies:
     "@babel/runtime" "^7.3.1"
     csstype "^2.6.5"
@@ -6417,6 +7515,13 @@ keyboard-key@^1.0.4:
   resolved "https://registry.yarnpkg.com/keyboard-key/-/keyboard-key-1.1.0.tgz#6f2e8e37fa11475bb1f1d65d5174f1b35653f5b7"
   integrity sha512-qkBzPTi3rlAKvX7k0/ub44sqOfXeLc/jcnGGmj5c7BJpU8eDrEVPyhCvNYAaoubbsLm9uGWwQJO1ytQK1a9/dQ==
 
+keyv@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
+  integrity sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==
+  dependencies:
+    json-buffer "3.0.0"
+
 killable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
@@ -6534,19 +7639,19 @@ load-json-file@^4.0.0:
     strip-bom "^3.0.0"
 
 loader-fs-cache@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.2.tgz#54cedf6b727e1779fd8f01205f05f6e88706f086"
-  integrity sha512-70IzT/0/L+M20jUlEqZhZyArTU6VKLRTYRDAYN26g4jfzpJqjipLL3/hgYpySqI9PwsVRHHFja0LfEmsx9X2Cw==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz#f08657646d607078be2f0a032f8bd69dd6f277d9"
+  integrity sha512-ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA==
   dependencies:
     find-cache-dir "^0.1.1"
-    mkdirp "0.5.1"
+    mkdirp "^0.5.1"
 
 loader-runner@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
   integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
-loader-utils@1.2.3, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
+loader-utils@1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
   integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
@@ -6555,6 +7660,15 @@ loader-utils@1.2.3, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.
     emojis-list "^2.0.0"
     json5 "^1.0.1"
 
+loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
+  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^1.0.1"
+
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -6583,6 +7697,11 @@ lodash._reinterpolate@^3.0.0:
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
   integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
+lodash.get@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
+  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
+
 lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
@@ -6619,9 +7738,9 @@ lodash.uniq@^4.5.0:
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
 loglevel@^1.6.6:
-  version "1.6.6"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.6.tgz#0ee6300cc058db6b3551fa1c4bf73b83bb771312"
-  integrity sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ==
+  version "1.6.8"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171"
+  integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==
 
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
   version "1.4.0"
@@ -6630,10 +7749,22 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
-lower-case@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
-  integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
+lower-case@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz#39eeb36e396115cc05e29422eaea9e692c9408c7"
+  integrity sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==
+  dependencies:
+    tslib "^1.10.0"
+
+lowercase-keys@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
+  integrity sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=
+
+lowercase-keys@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
+  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
 lru-cache@^5.1.1:
   version "5.1.1"
@@ -6642,6 +7773,13 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
+make-dir@^1.0.0, make-dir@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
+  dependencies:
+    pify "^3.0.0"
+
 make-dir@^2.0.0, make-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -6650,10 +7788,10 @@ make-dir@^2.0.0, make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
-make-dir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.0.tgz#1b5f39f6b9270ed33f9f054c5c0f84304989f801"
-  integrity sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==
+make-dir@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
   dependencies:
     semver "^6.0.0"
 
@@ -6709,6 +7847,11 @@ mdn-data@2.0.4:
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
   integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==
 
+mdn-data@2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz#852dc60fcaa5daa2e8cf6c9189c440ed3e042978"
+  integrity sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==
+
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -6800,17 +7943,17 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@1.43.0, "mime-db@>= 1.43.0 < 2":
-  version "1.43.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58"
-  integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==
+mime-db@1.44.0, "mime-db@>= 1.43.0 < 2", mime-db@^1.28.0:
+  version "1.44.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
+  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
 
 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
-  version "2.1.26"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06"
-  integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==
+  version "2.1.27"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
+  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
   dependencies:
-    mime-db "1.43.0"
+    mime-db "1.44.0"
 
 mime@1.6.0:
   version "1.6.0"
@@ -6818,20 +7961,27 @@ mime@1.6.0:
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mime@^2.4.4:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
-  integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
+  version "2.4.5"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.5.tgz#d8de2ecb92982dedbb6541c9b6841d7f218ea009"
+  integrity sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==
 
 mimic-fn@^2.0.0, mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
+mimic-response@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
+  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
+
 min-indent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.0.tgz#cfc45c37e9ec0d8f0a0ec3dd4ef7f7c3abe39256"
   integrity sha1-z8RcN+nsDY8KDsPdTvf3w6vjklY=
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 mini-create-react-context@^0.3.0:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz#79fc598f283dd623da8e088b05db8cddab250189"
@@ -6840,6 +7990,20 @@ mini-create-react-context@^0.3.0:
     "@babel/runtime" "^7.4.0"
     gud "^1.0.0"
     tiny-warning "^1.0.2"
+=======
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+mini-create-react-context@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.0.tgz#df60501c83151db69e28eac0ef08b4002efab040"
+  integrity sha512-b0TytUgFSbgFJGzJqXPKCFCBWigAjpjo+Fl7Vf7ZbKRDptszpppKxXH6DRXEABZ/gcEQczeb0iZ7JvL8e8jjCA==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    tiny-warning "^1.0.3"
+<<<<<<< HEAD
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
 
 mini-css-extract-plugin@0.9.0:
   version "0.9.0"
@@ -6868,15 +8032,10 @@ minimatch@3.0.4, minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^1.1.1, minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
+minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
 minipass-collect@^1.0.2:
   version "1.0.2"
@@ -6893,16 +8052,54 @@ minipass-flush@^1.0.5:
     minipass "^3.0.0"
 
 minipass-pipeline@^1.2.2:
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz#3dcb6bb4a546e32969c7ad710f2c79a86abba93a"
   integrity sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA==
+=======
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz#55f7839307d74859d6e8ada9c3ebe72cec216a34"
+  integrity sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ==
+<<<<<<< HEAD
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz#55f7839307d74859d6e8ada9c3ebe72cec216a34"
+  integrity sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ==
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+=======
+>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
   dependencies:
     minipass "^3.0.0"
 
 minipass@^3.0.0, minipass@^3.1.1:
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5"
   integrity sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==
+=======
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
+  integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
+<<<<<<< HEAD
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
+  integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+=======
+>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
   dependencies:
     yallist "^4.0.0"
 
@@ -6938,12 +8135,17 @@ mixin-object@^2.0.1:
     for-in "^0.1.3"
     is-extendable "^0.1.1"
 
-mkdirp@0.5.1, mkdirp@^0.5.1, mkdirp@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+mkdirp@^0.5.1, mkdirp@~0.5.1:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
   dependencies:
-    minimist "0.0.8"
+    minimist "^1.2.5"
+
+mkdirp@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
 move-concurrently@^1.0.1:
   version "1.0.1"
@@ -6991,9 +8193,9 @@ mute-stream@0.0.8:
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
 nan@^2.12.1:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
-  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+  version "2.14.1"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
+  integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -7037,12 +8239,13 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-no-case@^2.2.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
-  integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
+no-case@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz#c21b434c1ffe48b39087e86cfb4d2582e9df18f8"
+  integrity sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==
   dependencies:
-    lower-case "^1.1.1"
+    lower-case "^2.0.1"
+    tslib "^1.10.0"
 
 node-fetch@^1.0.1:
   version "1.7.3"
@@ -7107,12 +8310,10 @@ node-notifier@^5.4.2:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-releases@^1.1.47:
-  version "1.1.47"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.47.tgz#c59ef739a1fd7ecbd9f0b7cf5b7871e8a8b591e4"
-  integrity sha512-k4xjVPx5FpwBUj0Gw7uvFOTF4Ep8Hok1I6qjwL3pLfwe7Y0REQSAqOwwv9TWBCUtMHxcXfY4PgRLRozcChvTcA==
-  dependencies:
-    semver "^6.3.0"
+node-releases@^1.1.52, node-releases@^1.1.53:
+  version "1.1.55"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.55.tgz#8af23b7c561d8e2e6e36a46637bab84633b07cee"
+  integrity sha512-H3R3YR/8TjT5WPin/wOoHOUPHgvj8leuU/Keta/rwelEQN9pA/S2Dx8/se4pZ2LBxSd0nAGzsNzhqwa77v7F1w==
 
 normalize-package-data@^2.3.2:
   version "2.5.0"
@@ -7151,11 +8352,28 @@ normalize-url@1.9.1:
     query-string "^4.1.0"
     sort-keys "^1.0.0"
 
+normalize-url@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
+  integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==
+  dependencies:
+    prepend-http "^2.0.0"
+    query-string "^5.0.1"
+    sort-keys "^2.0.0"
+
 normalize-url@^3.0.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
+npm-conf@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
+  integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==
+  dependencies:
+    config-chain "^1.1.11"
+    pify "^3.0.0"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -7190,7 +8408,7 @@ oauth-sign@~0.9.0:
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@4.x, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -7205,9 +8423,9 @@ object-copy@^0.1.0:
     kind-of "^3.0.3"
 
 object-hash@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.1.tgz#cef18a0c940cc60aa27965ecf49b782cbf101d96"
-  integrity sha512-HgcGMooY4JC2PBt9sdUdJ6PMzpin+YtY3r/7wg0uTifP+HJWW8rammseSEHuyt0UeShI183UGssCJqm1bJR7QA==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.3.tgz#d12db044e03cd2ca3d77c0570d87225b02e1e6ea"
+  integrity sha512-JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg==
 
 object-inspect@^1.7.0:
   version "1.7.0"
@@ -7215,9 +8433,12 @@ object-inspect@^1.7.0:
   integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
 
 object-is@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz#6b80eb84fe451498f65007982f035a5b445edec4"
-  integrity sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz#c5d2e87ff9e119f78b7a088441519e2eec1573b6"
+  integrity sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
 
 object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
@@ -7323,9 +8544,9 @@ onetime@^5.1.0:
     mimic-fn "^2.1.0"
 
 open@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/open/-/open-7.0.2.tgz#fb3681f11f157f2361d2392307548ca1792960e8"
-  integrity sha512-70E/pFTPr7nZ9nLDPNTcj3IVqnNvKuP4VsBmoKV9YGTnChe0mlS3C4qM7qKarhZ8rGaHKLfo+vBTHXDp6ZSyLQ==
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/open/-/open-7.0.3.tgz#db551a1af9c7ab4c7af664139930826138531c48"
+  integrity sha512-sP2ru2v0P290WFfv49Ap8MF6PkzGNnGlAwHweB4WR4mr5d2d0woiCluUeJ218w7/+PmoBy9JmYgD5A4mLcWOFA==
   dependencies:
     is-docker "^2.0.0"
     is-wsl "^2.1.1"
@@ -7383,6 +8604,11 @@ os-tmpdir@~1.0.2:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
+p-cancelable@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
+  integrity sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==
+
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
@@ -7395,11 +8621,23 @@ p-each-series@^1.0.0:
   dependencies:
     p-reduce "^1.0.0"
 
+p-event@^2.1.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/p-event/-/p-event-2.3.1.tgz#596279ef169ab2c3e0cae88c1cfbb08079993ef6"
+  integrity sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA==
+  dependencies:
+    p-timeout "^2.0.1"
+
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
+p-is-promise@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
+  integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
+
 p-is-promise@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
@@ -7413,9 +8651,9 @@ p-limit@^1.1.0:
     p-try "^1.0.0"
 
 p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e"
-  integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
 
@@ -7464,6 +8702,13 @@ p-retry@^3.0.1:
   dependencies:
     retry "^0.12.0"
 
+p-timeout@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
+  integrity sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==
+  dependencies:
+    p-finally "^1.0.0"
+
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
@@ -7488,12 +8733,13 @@ parallel-transform@^1.1.0:
     inherits "^2.0.3"
     readable-stream "^2.1.5"
 
-param-case@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
-  integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
+param-case@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz#4be41f8399eff621c56eebb829a5e451d9801238"
+  integrity sha512-VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==
   dependencies:
-    no-case "^2.2.0"
+    dot-case "^3.0.3"
+    tslib "^1.10.0"
 
 parent-module@^1.0.0:
   version "1.0.1"
@@ -7502,7 +8748,7 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-asn1@^5.0.0:
+parse-asn1@^5.0.0, parse-asn1@^5.1.5:
   version "5.1.5"
   resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e"
   integrity sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==
@@ -7539,6 +8785,11 @@ parse-json@^5.0.0:
     json-parse-better-errors "^1.0.1"
     lines-and-columns "^1.1.6"
 
+parse-node-version@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
+  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
+
 parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
@@ -7554,6 +8805,14 @@ parseurl@~1.3.2, parseurl@~1.3.3:
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
+pascal-case@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.1.tgz#5ac1975133ed619281e88920973d2cd1f279de5f"
+  integrity sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==
+  dependencies:
+    no-case "^3.0.3"
+    tslib "^1.10.0"
+
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
@@ -7653,17 +8912,22 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+pend@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
+  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
+
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.4, picomatch@^2.0.7:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
-  integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==
+picomatch@^2.0.4, picomatch@^2.2.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
 
-pify@^2.0.0:
+pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
@@ -7725,13 +8989,20 @@ pkg-dir@^4.1.0:
   dependencies:
     find-up "^4.0.0"
 
-pkg-up@3.1.0:
+pkg-up@3.1.0, pkg-up@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
   integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
   dependencies:
     find-up "^3.0.0"
 
+pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
+  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
+  dependencies:
+    find-up "^2.1.0"
+
 pn@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
@@ -7744,15 +9015,15 @@ pnp-webpack-plugin@1.6.0:
   dependencies:
     ts-pnp "^1.1.2"
 
-popper.js@^1.14.1, popper.js@^1.14.4:
+popper.js@^1.14.4, popper.js@^1.16.1-lts:
   version "1.16.1"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
   integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
 
 portfinder@^1.0.25:
-  version "1.0.25"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz#254fd337ffba869f4b9d37edc298059cb4d35eca"
-  integrity sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==
+  version "1.0.26"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.26.tgz#475658d56ca30bed72ac7f1378ed350bd1b64e70"
+  integrity sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==
   dependencies:
     async "^2.6.2"
     debug "^3.1.1"
@@ -7779,14 +9050,13 @@ postcss-browser-comments@^3.0.0:
     postcss "^7"
 
 postcss-calc@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.1.tgz#36d77bab023b0ecbb9789d84dcb23c4941145436"
-  integrity sha512-oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ==
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.2.tgz#504efcd008ca0273120568b0792b16cdcde8aac1"
+  integrity sha512-rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ==
   dependencies:
-    css-unit-converter "^1.1.1"
-    postcss "^7.0.5"
-    postcss-selector-parser "^5.0.0-rc.4"
-    postcss-value-parser "^3.3.1"
+    postcss "^7.0.27"
+    postcss-selector-parser "^6.0.2"
+    postcss-value-parser "^4.0.2"
 
 postcss-color-functional-notation@^2.0.1:
   version "2.0.1"
@@ -8096,9 +9366,9 @@ postcss-modules-local-by-default@^3.0.2:
     postcss-value-parser "^4.0.0"
 
 postcss-modules-scope@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz#33d4fc946602eb5e9355c4165d68a10727689dba"
-  integrity sha512-OXRUPecnHCg8b9xWvldG/jUpRIGPNRka0r4D4j0ESUU2/5IOnpsjfPPmDprM3Ih8CgZ8FXjWqaniK5v4rWt3oQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee"
+  integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==
   dependencies:
     postcss "^7.0.6"
     postcss-selector-parser "^6.0.0"
@@ -8343,11 +9613,11 @@ postcss-selector-not@^4.0.0:
     postcss "^7.0.2"
 
 postcss-selector-parser@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865"
-  integrity sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz#b310f5c4c0fdaf76f94902bbaa30db6aa84f5270"
+  integrity sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==
   dependencies:
-    dot-prop "^4.1.1"
+    dot-prop "^5.2.0"
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
@@ -8388,15 +9658,15 @@ postcss-unique-selectors@^4.0.1:
     postcss "^7.0.0"
     uniqs "^2.0.0"
 
-postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.1:
+postcss-value-parser@^3.0.0:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9"
-  integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==
+postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.0.3:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
+  integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
 
 postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
   version "2.0.1"
@@ -8416,10 +9686,22 @@ postcss@7.0.21:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.23, postcss@^7.0.26, postcss@^7.0.5, postcss@^7.0.6:
-  version "7.0.26"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.26.tgz#5ed615cfcab35ba9bbb82414a4fa88ea10429587"
-  integrity sha512-IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA==
+postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.23, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6:
+<<<<<<< HEAD
+<<<<<<< HEAD
+  version "7.0.29"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.29.tgz#d3a903872bd52280b83bce38cdc83ce55c06129e"
+  integrity sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==
+=======
+  version "7.0.30"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.30.tgz#cc9378beffe46a02cbc4506a0477d05fcea9a8e2"
+  integrity sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+  version "7.0.30"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.30.tgz#cc9378beffe46a02cbc4506a0477d05fcea9a8e2"
+  integrity sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -8435,6 +9717,11 @@ prepend-http@^1.0.0:
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
   integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
 
+prepend-http@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
+
 prettier@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.1.tgz#3f00ac71263be34684b2b2c8d7e7f63737592dac"
@@ -8463,7 +9750,17 @@ pretty-format@^24.0.0, pretty-format@^24.3.0, pretty-format@^24.9.0:
     ansi-styles "^3.2.0"
     react-is "^16.8.4"
 
-private@^0.1.6:
+pretty-format@^25.1.0:
+  version "25.5.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a"
+  integrity sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==
+  dependencies:
+    "@jest/types" "^25.5.0"
+    ansi-regex "^5.0.0"
+    ansi-styles "^4.0.0"
+    react-is "^16.12.0"
+
+private@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
@@ -8478,7 +9775,7 @@ process@^0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
-progress@^2.0.0:
+progress@^2.0.0, progress@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
@@ -8496,19 +9793,19 @@ promise@^7.1.1:
     asap "~2.0.3"
 
 promise@^8.0.3:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-8.0.3.tgz#f592e099c6cddc000d538ee7283bb190452b0bf6"
-  integrity sha512-HeRDUL1RJiLhyA0/grn+PTShlBAcLuh/1BJGtrvjwbvRDCTLLMEz9rOGCV+R3vHY4MixIuoMEd9Yq/XvsTPcjw==
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e"
+  integrity sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==
   dependencies:
     asap "~2.0.6"
 
 prompts@^2.0.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.0.tgz#a444e968fa4cc7e86689a74050685ac8006c4cc4"
-  integrity sha512-NfbbPPg/74fT7wk2XYQ7hAIp9zJyZp5Fu19iRbORqqy1BhtrkZ0fPafBU+7bmn8ie69DpT0R6QpJIN2oisYjJg==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz#480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"
+  integrity sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==
   dependencies:
     kleur "^3.0.3"
-    sisteransi "^1.0.3"
+    sisteransi "^1.0.4"
 
 prop-types@15.6.2:
   version "15.6.2"
@@ -8527,23 +9824,28 @@ prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1,
     object-assign "^4.1.1"
     react-is "^16.8.1"
 
+proto-list@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+  integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
+
 proxy-addr@~2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
-  integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
+  integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==
   dependencies:
     forwarded "~0.1.2"
-    ipaddr.js "1.9.0"
+    ipaddr.js "1.9.1"
 
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
-psl@^1.1.24, psl@^1.1.28:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"
-  integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==
+psl@^1.1.28:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
 
 public-encrypt@^4.0.0:
   version "4.0.3"
@@ -8587,7 +9889,7 @@ punycode@1.3.2:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
   integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
 
-punycode@^1.2.4, punycode@^1.4.1:
+punycode@^1.2.4:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
@@ -8620,6 +9922,15 @@ query-string@^4.1.0:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
+query-string@^5.0.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
+  integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==
+  dependencies:
+    decode-uri-component "^0.2.0"
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@@ -8635,7 +9946,7 @@ querystringify@^2.1.1:
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
   integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
 
-raf@^3.4.1:
+raf@^3.4.0, raf@^3.4.1:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
   integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==
@@ -8672,6 +9983,67 @@ raw-body@2.4.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
+rc-align@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/rc-align/-/rc-align-3.0.0.tgz#5b0510aaa12dfef7b8d79877d39e43de5ef831bc"
+  integrity sha512-/T/4LOlKJLFe8EwsORuc3pFWOJ8caUpj2vtKIHWea4PhakoleM7KDQsx0n1WDQENIeSfrP9P1FowVxAdvhjsvw==
+  dependencies:
+    classnames "2.x"
+    dom-align "^1.7.0"
+    rc-util "^4.12.0"
+    resize-observer-polyfill "^1.5.1"
+
+rc-animate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/rc-animate/-/rc-animate-3.0.0.tgz#f76d7051136b7d650fb3d29366a160e95a369c0a"
+  integrity sha512-+ANeyCei4lWSJHWTcocywdYAy6lpRdBva/7Fs3nBBiAngW/W+Gmx+gQEcsmcgQBqziWUYnR91Bk12ltR3GBHPA==
+  dependencies:
+    "@ant-design/css-animation" "^1.7.2"
+    classnames "^2.2.6"
+    raf "^3.4.0"
+    rc-util "^4.15.3"
+
+rc-slider@^9.2.4:
+  version "9.2.4"
+  resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-9.2.4.tgz#92e2b58c53def9921ae0fc2822727ab5785b9ed0"
+  integrity sha512-wSr7vz+WtzzGqsGU2rTQ4mmLz9fkuIDMPYMYm8ygYFvxQ2Rh4uRhOWHYI0R8krNK5k1bGycckYxmQqUIvLAh3w==
+  dependencies:
+    babel-runtime "6.x"
+    classnames "^2.2.5"
+    rc-tooltip "^4.0.0"
+    rc-util "^4.0.4"
+    shallowequal "^1.1.0"
+    warning "^4.0.3"
+
+rc-tooltip@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/rc-tooltip/-/rc-tooltip-4.2.0.tgz#614235c94874861b7a473793992956fb666e2ba2"
+  integrity sha512-Ehf7nTQkn+2Y5J1awYIH8RmMTzHEBj+V7VpLLgCjMVMbigJLdW6pcB2XK6oSGUKl9VGzONdWqya+OKHIPd3D1Q==
+  dependencies:
+    rc-trigger "^4.2.1"
+
+rc-trigger@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-4.2.1.tgz#e30271c703d3a470fd47e75b7432102c7d0c9449"
+  integrity sha512-iFQ+/FbzDvYDrTS3jXbdk4MgVNU0R/A8UAAQkspXSr4Q6jTcR6p+lfNhSS0JJgJuXtfjoInC0+8jXK8HUShQ0g==
+  dependencies:
+    classnames "^2.2.6"
+    raf "^3.4.1"
+    rc-align "^3.0.0"
+    rc-animate "^3.0.0"
+    rc-util "^4.20.0"
+
+rc-util@^4.0.4, rc-util@^4.12.0, rc-util@^4.15.3, rc-util@^4.20.0:
+  version "4.20.5"
+  resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-4.20.5.tgz#f7c77569e971ae6a8ad56f899cadd22275398325"
+  integrity sha512-f67s4Dt1quBYhrVPq5QMKmK3eS2hN1NNIAyhaiG0HmvqiGYAXMQ7SP2AlGqv750vnzhJs38JklbkWT1/wjhFPg==
+  dependencies:
+    add-dom-event-listener "^1.1.0"
+    prop-types "^15.5.10"
+    react-is "^16.12.0"
+    react-lifecycles-compat "^3.0.4"
+    shallowequal "^1.1.0"
+
 react-app-polyfill@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-1.0.6.tgz#890f8d7f2842ce6073f030b117de9130a5f385f0"
@@ -8690,23 +10062,28 @@ react-axios@^2.0.3:
   integrity sha512-63kY2iupdRgbvPq9G8xmM0NWUnt2Q5YmpotMoLQsxKOzKXKZg2Lo6CzF/bcZvtmv3WnfjBU6Bg8nZQO28eIAZw==
 
 react-circular-input@^0.1.6:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/react-circular-input/-/react-circular-input-0.1.7.tgz#dcaae9176f1689b80ca23a52f740028a01ca633f"
-  integrity sha512-hlNMepjGhyWucsx3gOHMX9YVwN23dRqskap+7GkKzgrUrAqWZeNtriNetrHngSZ+c4OQe0JxHf8sgqgsxO61Vw==
+  version "0.1.9"
+  resolved "https://registry.yarnpkg.com/react-circular-input/-/react-circular-input-0.1.9.tgz#7e73baa2b146402089b7718c21c957d3b188228f"
+  integrity sha512-3oFqICtIFeXaKuqkYVm5hnbnmLu6BcNoumqJNRHhWp2i+IVjm0/HcTUEuW8kYGY6QaLeqkECnR43ps2nbdpetw==
 
 react-circular-slider-svg@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/react-circular-slider-svg/-/react-circular-slider-svg-0.1.5.tgz#bbca4fb04b47e22ada8b4bc39d83f16196d96256"
   integrity sha512-ZXSlwKHExjb950+84gydH5wxX1CnND1v4w1DywOHcOgzD48Wmjr+nME4JeOumNJ9QOXhm1HROhSEDMlTFIAGqw==
 
+react-confirm-alert@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/react-confirm-alert/-/react-confirm-alert-2.6.1.tgz#ab870eea77131547daabe2b97f6cd528ca4d921d"
+  integrity sha512-KxlpQoR4x/ET1oFPm/IGpsqnpzP17qkkQZuaO3pw7zGZ9oP5hElPtq/1vgoikoqNHQ2tMm6Iw9HQUNLoNgXkRA==
+
 react-dev-utils@^10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.0.tgz#b11cc48aa2be2502fb3c27a50d1dfa95cfa9dfe0"
-  integrity sha512-MwrvQW2TFjLblhqpDNeqCXHBkz3G5vc7k4wntgutAJZX4ia3o07eGKo6uYGhUOeJ0hfOxcpJFNFk7+4XCc1S8g==
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.1.tgz#f6de325ae25fa4d546d09df4bb1befdc6dd19c19"
+  integrity sha512-XxTbgJnYZmxuPtY3y/UV0D8/65NKkmaia4rXzViknVnZeVlklSh8u6TnaEYPfAi/Gh1TP4mEOXHI6jQOPbeakQ==
   dependencies:
     "@babel/code-frame" "7.8.3"
     address "1.1.2"
-    browserslist "4.8.6"
+    browserslist "4.10.0"
     chalk "2.4.2"
     cross-spawn "7.0.1"
     detect-port-alt "1.1.6"
@@ -8723,49 +10100,44 @@ react-dev-utils@^10.2.0:
     loader-utils "1.2.3"
     open "^7.0.2"
     pkg-up "3.1.0"
-    react-error-overlay "^6.0.6"
+    react-error-overlay "^6.0.7"
     recursive-readdir "2.2.2"
     shell-quote "1.7.2"
     strip-ansi "6.0.0"
     text-table "0.2.0"
 
 react-device-detect@^1.11.14:
-  version "1.11.14"
-  resolved "https://registry.yarnpkg.com/react-device-detect/-/react-device-detect-1.11.14.tgz#02ba2398e2ce81fb0eaed3e62a9ad713ab3870a7"
-  integrity sha512-WSjch241xI+rXHVtJaSYxNUT2WAykzfJgMI2Hg9xjNNTlIZdJu/fmWf4iedNH7qzFq+JaJ6fDJu3mrKFLerKBw==
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/react-device-detect/-/react-device-detect-1.12.1.tgz#0a2e0b02dbbceff7d619c57074a9e0ebab74bb35"
+  integrity sha512-BQ7xIEHx0VqPBGEtEFJRybHnhZ1Qn3BXX8dRR3EKLRfSTKpITUw925VYCGnygZDpmgYSq5NX0IvHGhy0w7Sckg==
   dependencies:
-    ua-parser-js "^0.7.20"
+    ua-parser-js "^0.7.21"
 
 react-dom@^16.12.0:
-  version "16.12.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz#0da4b714b8d13c2038c9396b54a92baea633fe11"
-  integrity sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw==
+  version "16.13.1"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f"
+  integrity sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.18.0"
+    scheduler "^0.19.1"
 
-react-error-overlay@^6.0.6:
-  version "6.0.6"
-  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.6.tgz#ac4d9dc4c1b5c536c2c312bf66aa2b09bfa384e2"
-  integrity sha512-Yzpno3enVzSrSCnnljmr4b/2KUQSMZaPuqmS26t9k4nW7uwJk6STWmH9heNjPuvqUTO3jOSPkHoKgO4+Dw7uIw==
+react-error-overlay@^6.0.7:
+  version "6.0.7"
+  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.7.tgz#1dcfb459ab671d53f660a991513cb2f0a0553108"
+  integrity sha512-TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA==
 
-react-is@^16.6.0, react-is@^16.6.3, react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.6:
-  version "16.13.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527"
-  integrity sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA==
-
-react-is@^16.8.1, react-is@^16.8.4:
-  version "16.12.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
-  integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==
-
-react-is@^16.9.0:
+react-is@^16.12.0, react-is@^16.6.0, react-is@^16.6.3, react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
+react-lifecycles-compat@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
+  integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
+
 react-modal@^2.2.2:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-2.4.1.tgz#cb09b26711b148eb9f59cb180e1b7d82980ded05"
@@ -8787,6 +10159,14 @@ react-popper@^1.3.4:
     typed-styles "^0.0.7"
     warning "^4.0.2"
 
+react-rangeslider@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/react-rangeslider/-/react-rangeslider-2.2.0.tgz#4362b01f4f5a455f0815d371d496f69ca4c6b5aa"
+  integrity sha512-5K7Woa+cyqZ5wiW5+KhqGV+3+FiFxGKQ9rUxTMh52sObXVYEeBbfxFrp1eBvS8mRIxnUbHz9ppnFP0LhwOyNeg==
+  dependencies:
+    classnames "^2.2.3"
+    resize-observer-polyfill "^1.4.2"
+
 react-redux@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.0.tgz#f970f62192b3981642fec46fd0db18a074fe879d"
@@ -8807,14 +10187,28 @@ react-round-slider@^1.0.1:
     react "16.4.2"
 
 react-router-dom@^5.1.2:
+<<<<<<< HEAD
+<<<<<<< HEAD
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.1.2.tgz#06701b834352f44d37fbb6311f870f84c76b9c18"
   integrity sha512-7BPHAaIwWpZS074UKaw1FjVdZBSVWEk8IuDXdB+OkLb8vd/WRQIpA4ag9WQk61aEfQs47wHyjWUoUGGZxpQXew==
+=======
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz#9e65a4d0c45e13289e66c7b17c7e175d0ea15662"
+  integrity sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz#9e65a4d0c45e13289e66c7b17c7e175d0ea15662"
+  integrity sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
   dependencies:
     "@babel/runtime" "^7.1.2"
     history "^4.9.0"
     loose-envify "^1.3.1"
     prop-types "^15.6.2"
+<<<<<<< HEAD
+<<<<<<< HEAD
     react-router "5.1.2"
     tiny-invariant "^1.0.2"
     tiny-warning "^1.0.0"
@@ -8823,12 +10217,35 @@ react-router@5.1.2, react-router@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.1.2.tgz#6ea51d789cb36a6be1ba5f7c0d48dd9e817d3418"
   integrity sha512-yjEuMFy1ONK246B+rsa0cUam5OeAQ8pyclRDgpxuSCrAlJ1qN9uZ5IgyKC7gQg0w8OM50NXHEegPh/ks9YuR2A==
+=======
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+    react-router "5.2.0"
+    tiny-invariant "^1.0.2"
+    tiny-warning "^1.0.0"
+
+react-router@5.2.0, react-router@^5.1.2:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.0.tgz#424e75641ca8747fbf76e5ecca69781aa37ea293"
+  integrity sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==
+<<<<<<< HEAD
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
   dependencies:
     "@babel/runtime" "^7.1.2"
     history "^4.9.0"
     hoist-non-react-statics "^3.1.0"
     loose-envify "^1.3.1"
+<<<<<<< HEAD
+<<<<<<< HEAD
     mini-create-react-context "^0.3.0"
+=======
+    mini-create-react-context "^0.4.0"
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+    mini-create-react-context "^0.4.0"
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
     path-to-regexp "^1.7.0"
     prop-types "^15.6.2"
     react-is "^16.6.0"
@@ -8895,10 +10312,18 @@ react-scripts@3.4.0:
   optionalDependencies:
     fsevents "2.1.2"
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 react-transition-group@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.3.0.tgz#fea832e386cf8796c58b61874a3319704f5ce683"
-  integrity sha512-1qRV1ZuVSdxPlPf4O8t7inxUGpdyO5zG9IoNfJxSO0ImU2A1YWkEQvFPuIPZmMLkg5hYs7vv5mMOyfgSkvAwvw==
+=======
+react-transition-group@^4.4.0:
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+react-transition-group@^4.4.0:
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9"
+  integrity sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==
   dependencies:
     "@babel/runtime" "^7.5.5"
     dom-helpers "^5.0.1"
@@ -8916,9 +10341,9 @@ react@16.4.2:
     prop-types "^15.6.0"
 
 react@^16.12.0:
-  version "16.12.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83"
-  integrity sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA==
+  version "16.13.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
+  integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -8940,7 +10365,7 @@ read-pkg-up@^4.0.0:
     find-up "^3.0.0"
     read-pkg "^3.0.0"
 
-read-pkg@^2.0.0:
+read-pkg@2.0.0, read-pkg@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
   integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
@@ -8958,7 +10383,7 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -8971,10 +10396,10 @@ read-pkg@^3.0.0:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.0.6, readable-stream@^3.1.1:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.5.0.tgz#465d70e6d1087f6162d079cd0b5db7fbebfd1606"
-  integrity sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==
+readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
@@ -8989,12 +10414,12 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-readdirp@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.3.0.tgz#984458d13a1e42e2e9f5841b129e162f369aff17"
-  integrity sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==
+readdirp@~3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada"
+  integrity sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==
   dependencies:
-    picomatch "^2.0.7"
+    picomatch "^2.2.1"
 
 realpath-native@^1.1.0:
   version "1.1.0"
@@ -9031,10 +10456,10 @@ redux@^4.0.5, redux@~4:
     loose-envify "^1.4.0"
     symbol-observable "^1.2.0"
 
-regenerate-unicode-properties@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"
-  integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==
+regenerate-unicode-properties@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
+  integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
   dependencies:
     regenerate "^1.4.0"
 
@@ -9048,17 +10473,18 @@ regenerator-runtime@^0.11.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
-regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.3:
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
-  integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
+regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4:
+  version "0.13.5"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
+  integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
 
-regenerator-transform@^0.14.0:
-  version "0.14.1"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz#3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb"
-  integrity sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==
+regenerator-transform@^0.14.2:
+  version "0.14.4"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
+  integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==
   dependencies:
-    private "^0.1.6"
+    "@babel/runtime" "^7.8.4"
+    private "^0.1.8"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
@@ -9087,31 +10513,31 @@ regexpp@^2.0.1:
   integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
 
 regexpp@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.0.0.tgz#dd63982ee3300e67b41c1956f850aa680d9d330e"
-  integrity sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
+  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
 
-regexpu-core@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6"
-  integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==
+regexpu-core@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
+  integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==
   dependencies:
     regenerate "^1.4.0"
-    regenerate-unicode-properties "^8.1.0"
-    regjsgen "^0.5.0"
-    regjsparser "^0.6.0"
+    regenerate-unicode-properties "^8.2.0"
+    regjsgen "^0.5.1"
+    regjsparser "^0.6.4"
     unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.1.0"
+    unicode-match-property-value-ecmascript "^1.2.0"
 
-regjsgen@^0.5.0:
+regjsgen@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
   integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
 
-regjsparser@^0.6.0:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.2.tgz#fd62c753991467d9d1ffe0a9f67f27a529024b96"
-  integrity sha512-E9ghzUtoLwDekPT0DYCp+c4h+bvuUpe6rRHCTYn6eGoqj1LgKXxT6I0Il4WbjhQkOghzi/V+y03bPKvbllL93Q==
+regjsparser@^0.6.4:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272"
+  integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==
   dependencies:
     jsesc "~0.5.0"
 
@@ -9163,9 +10589,9 @@ request-promise-native@^1.0.5:
     tough-cookie "^2.3.3"
 
 request@^2.87.0, request@^2.88.0:
-  version "2.88.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -9174,7 +10600,7 @@ request@^2.87.0, request@^2.88.0:
     extend "~3.0.2"
     forever-agent "~0.6.1"
     form-data "~2.3.2"
-    har-validator "~5.1.0"
+    har-validator "~5.1.3"
     http-signature "~1.2.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
@@ -9184,7 +10610,7 @@ request@^2.87.0, request@^2.88.0:
     performance-now "^2.1.0"
     qs "~6.5.2"
     safe-buffer "^5.1.2"
-    tough-cookie "~2.4.3"
+    tough-cookie "~2.5.0"
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
@@ -9208,6 +10634,11 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
+resize-observer-polyfill@^1.4.2, resize-observer-polyfill@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
+  integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
+
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -9256,13 +10687,27 @@ resolve@1.1.7:
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@1.15.0, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.3.2, resolve@^1.8.1:
+resolve@1.15.0:
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.0.tgz#1b7ca96073ebb52e741ffd799f6b39ea462c67f5"
   integrity sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==
   dependencies:
     path-parse "^1.0.6"
 
+resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.3.2, resolve@^1.8.1:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
+  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
+  dependencies:
+    path-parse "^1.0.6"
+
+responselike@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
+  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
+  dependencies:
+    lowercase-keys "^1.0.0"
+
 restore-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
@@ -9331,12 +10776,10 @@ rsvp@^4.8.4:
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
   integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
 
-run-async@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
-  integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
-  dependencies:
-    is-promise "^2.1.0"
+run-async@^2.2.0, run-async@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
 
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
@@ -9346,9 +10789,9 @@ run-queue@^1.0.0, run-queue@^1.0.3:
     aproba "^1.1.1"
 
 rxjs@^6.5.3:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c"
-  integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==
+  version "6.5.5"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
+  integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -9357,10 +10800,22 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+<<<<<<< HEAD
+<<<<<<< HEAD
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
   integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+=======
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
 
 safe-regex@^1.1.0:
   version "1.1.0"
@@ -9417,10 +10872,10 @@ saxes@^3.1.9:
   dependencies:
     xmlchars "^2.1.1"
 
-scheduler@^0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.18.0.tgz#5901ad6659bc1d8f3fdaf36eb7a67b0d6746b1c4"
-  integrity sha512-agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ==
+scheduler@^0.19.1:
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
+  integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -9435,13 +10890,20 @@ schema-utils@^1.0.0:
     ajv-keywords "^3.1.0"
 
 schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6.4:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz#a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53"
-  integrity sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==
+  version "2.6.6"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.6.tgz#299fe6bd4a3365dc23d99fd446caff8f1d6c330c"
+  integrity sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==
   dependencies:
-    ajv "^6.10.2"
+    ajv "^6.12.0"
     ajv-keywords "^3.4.1"
 
+seek-bzip@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.5.tgz#cfe917cb3d274bcffac792758af53173eb1fabdc"
+  integrity sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=
+  dependencies:
+    commander "~2.8.1"
+
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
@@ -9486,6 +10948,20 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+semver@^7.3.2:
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
+  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+
+<<<<<<< HEAD
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
 send@0.17.1:
   version "0.17.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
@@ -9628,9 +11104,9 @@ shellwords@^0.1.1:
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
 signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
 
 simple-swizzle@^0.2.2:
   version "0.2.2"
@@ -9639,10 +11115,10 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
-sisteransi@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.4.tgz#386713f1ef688c7c0304dc4c0632898941cad2e3"
-  integrity sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig==
+sisteransi@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
+  integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
 
 slash@^1.0.0:
   version "1.0.0"
@@ -9668,6 +11144,11 @@ slice-ansi@^2.1.0:
     astral-regex "^1.0.0"
     is-fullwidth-code-point "^2.0.0"
 
+slugify@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.4.0.tgz#c9557c653c54b0c7f7a8e786ef3431add676d2cb"
+  integrity sha512-FtLNsMGBSRB/0JOE2A0fxlqjI6fJsgHGS13iTuVT28kViI4JjUiNqp/vyis0ZXYcMnpR3fzGNkv+6vRlI2GwdQ==
+
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -9718,6 +11199,28 @@ sockjs@0.3.19:
     faye-websocket "^0.10.0"
     uuid "^3.0.1"
 
+sonarqube-scanner@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/sonarqube-scanner/-/sonarqube-scanner-2.6.0.tgz#ba593635edc96cc86212ec9a987fe24f6276ec93"
+  integrity sha512-H6DKMW2WBjFAZ81ubscwE803aiaTQCBeOIu+STrACRdNtrw6WmRmUvw5JY5eGxs/Q+ysyEvz4hInWn0h+7YAlQ==
+  dependencies:
+    download "^7.1.0"
+    extend "3.0.2"
+    fancy-log "^1.3.3"
+    lodash.get "^4.4.2"
+    lodash.uniq "^4.5.0"
+    mkdirp "^1.0.3"
+    progress "^2.0.3"
+    read-pkg "2.0.0"
+    slugify "^1.4.0"
+
+sort-keys-length@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188"
+  integrity sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=
+  dependencies:
+    sort-keys "^1.0.0"
+
 sort-keys@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
@@ -9725,6 +11228,13 @@ sort-keys@^1.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
+sort-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
+  dependencies:
+    is-plain-obj "^1.0.0"
+
 source-list-map@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
@@ -9742,9 +11252,9 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
     urix "^0.1.0"
 
 source-map-support@^0.5.6, source-map-support@~0.5.12:
-  version "0.5.16"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
-  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -9773,14 +11283,36 @@ spdx-correct@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-exceptions@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
-  integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
 
 spdx-expression-parse@^3.0.0:
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
   integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
+=======
+<<<<<<< HEAD
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+=======
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
+>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
@@ -9803,9 +11335,9 @@ spdy-transport@^3.0.0:
     wbuf "^1.7.3"
 
 spdy@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.1.tgz#6f12ed1c5db7ea4f24ebb8b89ba58c87c08257f2"
-  integrity sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b"
+  integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==
   dependencies:
     debug "^4.1.0"
     handle-thing "^2.0.0"
@@ -9971,21 +11503,39 @@ string-width@^4.1.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
-string.prototype.trimleft@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74"
-  integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==
+string.prototype.trimend@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
+  integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
   dependencies:
     define-properties "^1.1.3"
-    function-bind "^1.1.1"
+    es-abstract "^1.17.5"
+
+string.prototype.trimleft@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"
+  integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+    string.prototype.trimstart "^1.0.0"
 
 string.prototype.trimright@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9"
-  integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"
+  integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==
   dependencies:
     define-properties "^1.1.3"
-    function-bind "^1.1.1"
+    es-abstract "^1.17.5"
+    string.prototype.trimend "^1.0.0"
+
+string.prototype.trimstart@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
+  integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
 
 string_decoder@^1.0.0, string_decoder@^1.1.1:
   version "1.3.0"
@@ -10051,6 +11601,13 @@ strip-comments@^1.0.2:
     babel-extract-comments "^1.0.0"
     babel-plugin-transform-object-rest-spread "^6.26.0"
 
+strip-dirs@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-2.1.0.tgz#4987736264fc344cf20f6c34aca9d13d1d4ed6c5"
+  integrity sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==
+  dependencies:
+    is-natural-number "^4.0.1"
+
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
@@ -10064,9 +11621,16 @@ strip-indent@^3.0.0:
     min-indent "^1.0.0"
 
 strip-json-comments@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
-  integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz#7638d31422129ecf4457440009fba03f9f9ac180"
+  integrity sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==
+
+strip-outer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.1.tgz#b2fd2abf6604b9d1e6013057195df836b8a9d631"
+  integrity sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==
+  dependencies:
+    escape-string-regexp "^1.0.2"
 
 style-loader@0.23.1:
   version "0.23.1"
@@ -10077,13 +11641,13 @@ style-loader@0.23.1:
     schema-utils "^1.0.0"
 
 styled-components@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.0.1.tgz#57782a6471031abefb2db5820a1876ae853bc619"
-  integrity sha512-E0xKTRIjTs4DyvC1MHu/EcCXIj6+ENCP8hP01koyoADF++WdBUOrSGwU1scJRw7/YaYOhDvvoad6VlMG+0j53A==
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.1.0.tgz#2e3985b54f461027e1c91af3229e1c2530872a4e"
+  integrity sha512-0Qs2wEkFBXHFlysz6CV831VG6HedcrFUwChjnWylNivsx14MtmqQsohi21rMHZxzuTba063dEyoe/SR6VGJI7Q==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/traverse" "^7.4.5"
-    "@emotion/is-prop-valid" "^0.8.3"
+    "@emotion/is-prop-valid" "^0.8.8"
     "@emotion/stylis" "^0.8.4"
     "@emotion/unitless" "^0.7.4"
     babel-plugin-styled-components ">= 1"
@@ -10120,7 +11684,7 @@ supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.0.0:
+supports-color@^7.0.0, supports-color@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
   integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
@@ -10128,9 +11692,9 @@ supports-color@^7.0.0:
     has-flag "^4.0.0"
 
 svg-parser@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.3.tgz#a38f2e4e5442986f7ecb554c11f1411cfcf8c2b9"
-  integrity sha512-fnCWiifNhK8i2Z7b9R5tbNahpxrRdAaQbnoxKlT2KrSCj9Kq/yBSgulCRgBJRhy1dPnSY5slg5ehPUnzpEcHlg==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5"
+  integrity sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==
 
 svgo@^1.0.0, svgo@^1.2.2:
   version "1.3.2"
@@ -10176,6 +11740,19 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
+tar-stream@^1.5.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
+  integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
+  dependencies:
+    bl "^1.0.0"
+    buffer-alloc "^1.2.0"
+    end-of-stream "^1.0.0"
+    fs-constants "^1.0.0"
+    readable-stream "^2.3.0"
+    to-buffer "^1.1.1"
+    xtend "^4.0.0"
+
 terser-webpack-plugin@2.3.4:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.4.tgz#ac045703bd8da0936ce910d8fb6350d0e1dee5fe"
@@ -10206,10 +11783,10 @@ terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser@^4.1.2, terser@^4.3.9, terser@^4.4.3:
-  version "4.6.3"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.3.tgz#e33aa42461ced5238d352d2df2a67f21921f8d87"
-  integrity sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ==
+terser@^4.1.2, terser@^4.4.3, terser@^4.6.3:
+  version "4.6.13"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.13.tgz#e879a7364a5e0db52ba4891ecde007422c56a916"
+  integrity sha512-wMvqukYgVpQlymbnNbabVZbtM6PN63AzqexpwJL8tbh/mRT9LE5o+ruVduAGL7D6Fpjl+Q+06U5I9Ul82odAhw==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
@@ -10243,7 +11820,7 @@ through2@^2.0.0:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
-through@^2.3.6:
+through@^2.3.6, through@^2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
@@ -10253,6 +11830,16 @@ thunky@^1.0.2:
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
   integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
 
+time-stamp@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
+  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
+
+timed-out@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
+  integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
+
 timers-browserify@^2.0.4:
   version "2.0.11"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz#800b1f3eee272e5bc53ee465a04d0e804c31211f"
@@ -10270,7 +11857,15 @@ tiny-invariant@^1.0.2:
   resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz#634c5f8efdc27714b7f386c35e6760991d230875"
   integrity sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw==
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 tiny-warning@^1.0.0, tiny-warning@^1.0.2:
+=======
+tiny-warning@^1.0.0, tiny-warning@^1.0.2, tiny-warning@^1.0.3:
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+tiny-warning@^1.0.0, tiny-warning@^1.0.2, tiny-warning@^1.0.3:
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
   integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
@@ -10292,6 +11887,11 @@ to-arraybuffer@^1.0.0:
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
   integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
+to-buffer@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
+  integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==
+
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
@@ -10334,7 +11934,7 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
-tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@^2.5.0:
+tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@^2.5.0, tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
   integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
@@ -10342,14 +11942,6 @@ tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@^2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tough-cookie@~2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
-  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
-  dependencies:
-    psl "^1.1.24"
-    punycode "^1.4.1"
-
 tr46@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
@@ -10357,15 +11949,49 @@ tr46@^1.0.1:
   dependencies:
     punycode "^2.1.0"
 
-ts-pnp@1.1.5, ts-pnp@^1.1.2:
+trim-repeated@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-1.0.0.tgz#e3646a2ea4e891312bf7eace6cfb05380bc01c21"
+  integrity sha1-42RqLqTokTEr9+rObPsFOAvAHCE=
+  dependencies:
+    escape-string-regexp "^1.0.2"
+
+ts-pnp@1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.5.tgz#840e0739c89fce5f3abd9037bb091dbff16d9dec"
   integrity sha512-ti7OGMOUOzo66wLF3liskw6YQIaSsBgc4GOAlWRnIEj8htCxJUxskanMUoJOD6MDCRAXo36goXJZch+nOS0VMA==
 
-tslib@^1.8.1, tslib@^1.9.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
-  integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
+ts-pnp@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
+  integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==
+
+tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0:
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
+  version "1.11.2"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.2.tgz#9c79d83272c9a7aaf166f73915c9667ecdde3cc9"
+  integrity sha512-tTSkux6IGPnUGUd1XAZHcpu85MOkIl5zX49pO+jfsie3eP0B6pyhOlLXm3cAC6T7s+euSDDUUV+Acop5WmtkVg==
+=======
+<<<<<<< HEAD
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
+  integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
+>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
+=======
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
+  integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
+>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
+=======
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
+  integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
+>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
+>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
 
 tsutils@^3.17.1:
   version "3.17.1"
@@ -10398,6 +12024,11 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-fest@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
+  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
+
 type-fest@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
@@ -10431,11 +12062,19 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-ua-parser-js@^0.7.18, ua-parser-js@^0.7.20:
+ua-parser-js@^0.7.18, ua-parser-js@^0.7.21:
   version "0.7.21"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777"
   integrity sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==
 
+unbzip2-stream@^1.0.9:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.2.tgz#84eb9e783b186d8fb397515fbb656f312f1a7dbf"
+  integrity sha512-pZMVAofMrrHX6Ik39hCk470kulCbmZ2SWfQLPmTWqfJV/oUm0gn1CblvHdUu4+54Je6Jq34x8kY6XjTy6dMkOg==
+  dependencies:
+    buffer "^5.2.1"
+    through "^2.3.8"
+
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
@@ -10449,15 +12088,15 @@ unicode-match-property-ecmascript@^1.0.4:
     unicode-canonical-property-names-ecmascript "^1.0.4"
     unicode-property-aliases-ecmascript "^1.0.4"
 
-unicode-match-property-value-ecmascript@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277"
-  integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==
+unicode-match-property-value-ecmascript@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
+  integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
 
 unicode-property-aliases-ecmascript@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57"
-  integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
+  integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
 
 union-value@^1.0.0:
   version "1.0.1"
@@ -10521,11 +12160,6 @@ upath@^1.1.1:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
-upper-case@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
-  integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
-
 uri-js@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
@@ -10547,6 +12181,13 @@ url-loader@2.3.0:
     mime "^2.4.4"
     schema-utils "^2.5.0"
 
+url-parse-lax@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
+  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
+  dependencies:
+    prepend-http "^2.0.0"
+
 url-parse@^1.4.3:
   version "1.4.7"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
@@ -10555,6 +12196,11 @@ url-parse@^1.4.3:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
 
+url-to-options@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
+  integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=
+
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -10663,11 +12309,11 @@ vm-browserify@^1.0.1:
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
 w3c-hr-time@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
-  integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
+  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
   dependencies:
-    browser-process-hrtime "^0.1.2"
+    browser-process-hrtime "^1.0.0"
 
 w3c-xmlserializer@^1.1.2:
   version "1.1.2"
@@ -10678,7 +12324,7 @@ w3c-xmlserializer@^1.1.2:
     webidl-conversions "^4.0.2"
     xml-name-validator "^3.0.0"
 
-wait-for-expect@^3.0.0:
+wait-for-expect@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/wait-for-expect/-/wait-for-expect-3.0.2.tgz#d2f14b2f7b778c9b82144109c8fa89ceaadaa463"
   integrity sha512-cfS1+DZxuav1aBYbaO/kE06EOS8yRw7qOFoD3XtjTkYvCvh3zUvNST8DXK/nPaeqIzIv3P3kL3lRJn8iwOiSag==
@@ -10698,11 +12344,11 @@ warning@^4.0.2, warning@^4.0.3:
     loose-envify "^1.0.0"
 
 watchpack@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
-  integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz#280da0a8718592174010c078c7585a74cd8cd0e2"
+  integrity sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==
   dependencies:
-    chokidar "^2.0.2"
+    chokidar "^2.1.8"
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
@@ -11128,11 +12774,11 @@ yallist@^4.0.0:
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
 yaml@^1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz#f26aabf738590ab61efaca502358e48dc9f348b2"
-  integrity sha512-qXROVp90sb83XtAoqE8bP9RwAkTTZbugRUTm5YeFCBfNRPEp2YzTeqWiz7m5OORHzEvrA/qcGS8hp/E+MMROYw==
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.9.2.tgz#f0cfa865f003ab707663e4f04b3956957ea564ed"
+  integrity sha512-HPT7cGGI0DuRcsO51qC1j9O16Dh1mZ2bnXwsi0jrSpsLz0WxOLSLXfkABVl6bZO629py3CU+OMJtpNHDLB97kg==
   dependencies:
-    "@babel/runtime" "^7.6.3"
+    "@babel/runtime" "^7.9.2"
 
 yargs-parser@^11.1.1:
   version "11.1.1"
@@ -11142,10 +12788,10 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^13.1.1:
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
-  integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
+yargs-parser@^13.1.2:
+  version "13.1.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
+  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
@@ -11169,9 +12815,9 @@ yargs@12.0.5:
     yargs-parser "^11.1.1"
 
 yargs@^13.3.0:
-  version "13.3.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
-  integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==
+  version "13.3.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
+  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
   dependencies:
     cliui "^5.0.0"
     find-up "^3.0.0"
@@ -11182,4 +12828,12 @@ yargs@^13.3.0:
     string-width "^3.0.0"
     which-module "^2.0.0"
     y18n "^4.0.0"
-    yargs-parser "^13.1.1"
+    yargs-parser "^13.1.2"
+
+yauzl@^2.4.2:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
+  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
+  dependencies:
+    buffer-crc32 "~0.2.3"
+    fd-slicer "~1.1.0"